Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 88c88f0

Browse files
authored
Merge branch 'main' into antonioseric-KotlinxCoroutines-1.4.1
2 parents bb16f15 + eeab68e commit 88c88f0

File tree

6 files changed

+5444
-11
lines changed

6 files changed

+5444
-11
lines changed

Android/SquareOkHttp3/source/Square.OkHttp3/Square.OkHttp3.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.22">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
3-
<TargetFrameworks>monoandroid10.0</TargetFrameworks>
3+
<TargetFrameworks>monoandroid9.0</TargetFrameworks>
44
<IsBindingProject>True</IsBindingProject>
55
<AssemblyName>Square.OkHttp3</AssemblyName>
66
<RootNamespace>Square.OkHttp3</RootNamespace>
@@ -35,7 +35,7 @@
3535

3636
<ItemGroup>
3737
<PackageReference Include="Square.OkIO" Version="2.8.0" />
38-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.4.10" />
38+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.4.32.1" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

Android/SquareOkIO/build.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var TARGET = Argument ("t", Argument ("target", "ci"));
22

3-
var NUGET_VERSION = "2.8.0";
4-
var JAR_VERSION = "2.8.0";
3+
var NUGET_VERSION = "2.10.0";
4+
var JAR_VERSION = "2.10.0";
55
var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okio/okio/{JAR_VERSION}/okio-{JAR_VERSION}.jar";
66

77
Task ("externals")

Android/SquareOkIO/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"Maven": {
77
"ArtifactId": "okio",
88
"GroupId": "com.squareup.okio",
9-
"Version": "2.8.0",
9+
"Version": "2.10.0",
1010
"NuGetId": "Square.OkIO"
1111
}
1212
}

Android/SquareOkIO/samples/OkIOSample/OkIOSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</ItemGroup>
4949
<ItemGroup>
5050
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
51-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.4.0" PrivateAssets="None" />
51+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.4.32.1" PrivateAssets="None" />
5252
</ItemGroup>
5353
<ItemGroup>
5454
<Compile Include="MainActivity.cs" />

0 commit comments

Comments
 (0)