Merge pull request #1339 from 4brunu/feature/moshi1.13.0

Moshi-1.13.0

Author: moljac

Android/SquareMoshi/build.cake

@@ -1,8 +1,8 @@
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var NUGET_VERSION = "1.12.0";
+var NUGET_VERSION = "1.13.0";
 
-var JAR_VERSION = "1.12.0";
+var JAR_VERSION = "1.13.0";
 var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/moshi/moshi/{JAR_VERSION}/moshi-{JAR_VERSION}.jar";
 
 Task ("externals")

Android/SquareMoshi/cgmanifest.json

@@ -6,7 +6,7 @@
         "Maven": {
           "ArtifactId": "moshi",
           "GroupId": "com.squareup.moshi",
-          "Version": "1.12.0",
+          "Version": "1.13.0",
           "NuGetId": "Square.Moshi"
         }
       }

Android/SquareMoshi/source/Square.Moshi/Square.Moshi.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>monoandroid9.0</TargetFrameworks>
+    <TargetFrameworks>monoandroid12.0</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Square.Moshi</AssemblyName>
     <RootNamespace>Square.Moshi</RootNamespace>
@@ -23,12 +23,12 @@
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>moshi xamarin android monodroid</PackageTags>
-    <PackageVersion>1.12.0</PackageVersion>
+    <PackageVersion>1.13.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Square.OkiO" Version="2.10.0" />
-    <PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.4.32.1" />
+    <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.6.10" />
   </ItemGroup>
 
   <ItemGroup>

azure-pipelines.yml

@@ -22,7 +22,7 @@ variables:
   DotNet6Version: 6.0.200
   XamarinAndroidVsix: https://download.visualstudio.microsoft.com/download/pr/7372b89a-b719-426c-9916-c33cbc6c7a61/45c38957fdcacfbee95be95ee40c4f5a4cc9ace69416625ad26e2da83b176941/Xamarin.Android.Sdk-11.4.0.5.vsix
   # NOTE: there wasn't a public release of 16.11 for macOS
-  XamarinAndroidPkg:  https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/4941337/d16-11/7776c9f1c8fac303c3aa57867825990850be0384/xamarin.android-11.4.0.5.pkg
+  XamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/5673868/d17-1/19b97b7614b275a84d9e38096bd1fe0e25a494d4/xamarin.android-12.2.0.4.pkg
 jobs:
   - template: .ci/build.v1.yml@components
     parameters: