Merge branch 'main' into main

xamarin · Mar 10, 2022 · ce116d6 · ce116d6
2 parents df4fbf1 + 10b3bf4
commit ce116d6
Show file tree

Hide file tree

Showing 27 changed files with 239 additions and 55 deletions.
diff --git a/.ci/build.v1.yml b/.ci/build.v1.yml
@@ -24,6 +24,7 @@ parameters:
  macosAgentPoolName: 'Azure Pipelines' # the name of the macOS VM pool
  windowsAgentPoolName: 'Azure Pipelines' # the name of the Windows VM pool
  linuxImage: '' # the name of the Linux VM image (linuxImage: 'Hosted Ubuntu 1604')
+ linuxImageOverride: '' # used to access 1ES hardened images: name of ImageOverride demand to use such as AzurePipelinesUbuntu20.04compliant or AzurePipelinesUbuntu18.04compliant when linuxAgentPoolName set to the AzurePipelines-EO pool
  macosImage: 'macOS-11' # the name of the macOS VM image
  # 20211121
  # macOS-latest = macOS-10.15
@@ -56,28 +57,76 @@ parameters:
  targetsFilter: 'ci' # [manifest, directories] the targets of the items to build
 
 jobs:
-- ${{ if or(ne(parameters.linuxImage, ''), ne(parameters.macosImage, '')) }}:
- - job: ${{ parameters.name }}
- strategy:
- matrix:
- ${{ if ne(parameters.linuxImage, '') }}:
- linux:
- poolName: ${{ parameters.linuxAgentPoolName }}
- imageName: ${{ parameters.linuxImage }}
- poolDemand: Agent.Name
- ${{ if ne(parameters.macosImage, '') }}:
- macos:
- poolName: ${{ parameters.macosAgentPoolName }}
- imageName: ${{ parameters.macosImage }}
- poolDemand: Agent.Name
+- ${{ if or(ne(parameters.linuxAgentPoolName, 'Azure Pipelines'), ne(parameters.linuxImage, '')) }}:
+ - job: linux
+ displayName: '${{ parameters.displayName }} linux'
+ timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+ continueOnError: ${{ eq(parameters.continueOnError, 'true') }}
+ dependsOn: ${{ parameters.dependsOn }}
+ pool:
+ name: ${{ parameters.linuxAgentPoolName }}
+ vmImage: ${{ parameters.linuxImage }}
+ ${{ if ne(parameters.linuxImageOverride, '') }}:
+ demands:
+ - ImageOverride -equals ${{ parameters.linuxImageOverride }}
+ steps:
+ - template: build.steps.v1.yml
+ parameters:
+ name: ${{ parameters.name }}
+ displayName: ${{ parameters.displayName }}
+ timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+ dependsOn: ${{ parameters.dependsOn }}
+ initSteps: ${{ parameters.initSteps }}
+ preBuildSteps: ${{ parameters.preBuildSteps }}
+ postBuildSteps: ${{ parameters.postBuildSteps }}
+ masterBranchName: ${{ parameters.masterBranchName }}
+ installAppleCertificates: ${{ parameters.installAppleCertificates }}
+ submodules: ${{ parameters.submodules }}
+ areaPath: ${{ parameters.areaPath }}
+ runChecks: ${{ parameters.runChecks }}
+ continueOnError: ${{ parameters.continueOnError }}
+ publishJob: ${{ parameters.publishJob }}
+ publishOutputSuffix: ${{ parameters.publishOutputSuffix }}
+ signListPath: ${{ parameters.signListPath }}
+ linuxAgentPoolName: ${{ parameters.linuxAgentPoolName }}
+ macosAgentPoolName: ${{ parameters.macosAgentPoolName }}
+ windowsAgentPoolName: ${{ parameters.windowsAgentPoolName }}
+ linuxImage: ${{ parameters.linuxImage }}
+ macosImage: ${{ parameters.macosImage }}
+ windowsImage: ${{ parameters.windowsImage }}
+ windowsImageOverride: ${{ parameters.windowsImageOverride }}
+ mono: ${{ parameters.mono }}
+ xcode: ${{ parameters.xcode }}
+ dotnet: ${{ parameters.dotnet }}
+ dotnetStable: ${{ parameters.dotnetStable }}
+ cake: ${{ parameters.cake }}
+ apiTools: ${{ parameters.apiTools }}
+ xharness: ${{ parameters.xharness }}
+ tools: ${{ parameters.tools }}
+ cakeTemplatesBranch: ${{ parameters.cakeTemplatesBranch }}
+ buildType: ${{ parameters.buildType }}
+ steps: ${{ parameters.steps }}
+ verbosity: ${{ parameters.verbosity }}
+ configuration: ${{ parameters.configuration }}
+ validPackagePrefixes: ${{ parameters.validPackagePrefixes }}
+ artifactsPath: ${{ parameters.artifactsPath }}
+ cakeTarget: ${{ parameters.cakeTarget }}
+ cakeFile: ${{ parameters.cakeFile }}
+ cakeExtraArgs: ${{ parameters.cakeExtraArgs }}
+ forceBuild: ${{ parameters.forceBuild }}
+ namesFilter: ${{ parameters.namesFilter }}
+ targetsFilter: ${{ parameters.targetsFilter }}
+
 
- displayName: ${{ parameters.displayName }}
+- ${{ if ne(parameters.macosImage, '') }}:
+ - job: macos
+ displayName: '${{ parameters.displayName }} macos'
  timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
  continueOnError: ${{ eq(parameters.continueOnError, 'true') }}
  dependsOn: ${{ parameters.dependsOn }}
  pool:
- name: $(poolName)
- vmImage: $(imageName)
+ name: ${{ parameters.macosAgentPoolName }}
+ vmImage: ${{ parameters.macosImage }}
  steps:
  - template: build.steps.v1.yml
  parameters:

diff --git a/Android/Guava/Directory.Build.props b/Android/Guava/Directory.Build.props
@@ -3,9 +3,9 @@
  <!-- Uncomment if a $(PackageVersionSuffix) is ever needed -->
  <!-- <PackageVersionSuffix>-net6preview04</PackageVersionSuffix> -->
  <!-- <PackageVersionSuffix Condition=" '$(BUILD_BUILDID)' != '' ">$(PackageVersionSuffix).$(BUILD_BUILDID)</PackageVersionSuffix> -->
- <GuavaNuGetVersion>29.0.0$(PackageVersionSuffix)</GuavaNuGetVersion>
- <GuavaFailureAccessNuGetVersion>1.0.1.5$(PackageVersionSuffix)</GuavaFailureAccessNuGetVersion>
- <GuavaListenableFutureNuGetVersion>1.0.0.5$(PackageVersionSuffix)</GuavaListenableFutureNuGetVersion>
+ <GuavaNuGetVersion>31.1.0$(PackageVersionSuffix)</GuavaNuGetVersion>
+ <GuavaFailureAccessNuGetVersion>1.0.1.6$(PackageVersionSuffix)</GuavaFailureAccessNuGetVersion>
+ <GuavaListenableFutureNuGetVersion>1.0.0.6$(PackageVersionSuffix)</GuavaListenableFutureNuGetVersion>
 
  <!-- Opt out of C#8 features to maintain compatibility with legacy -->
  <AndroidBoundInterfacesContainConstants>false</AndroidBoundInterfacesContainConstants>

diff --git a/Android/Guava/Guava.sln b/Android/Guava/Guava.sln
@@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Guava.FailureAccess", "sour
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Guava.ListenableFuture", "source\Guava.ListenableFuture\Guava.ListenableFuture.csproj", "{6ADF0C2E-8513-40E6-921B-08AEFD7CBDD6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Google.J2Objc.Annotations", "source\Xamarin.Google.J2Objc.Annotations\Xamarin.Google.J2Objc.Annotations.csproj", "{650C222B-1BE3-4F5E-970A-96B78002B741}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.CheckerFramework.CheckerCompatQual", "source\Xamarin.CheckerFramework.CheckerCompatQual\Xamarin.CheckerFramework.CheckerCompatQual.csproj", "{A5060B44-96C5-4B01-A024-C7310386F118}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -27,6 +31,14 @@ Global
  {6ADF0C2E-8513-40E6-921B-08AEFD7CBDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {6ADF0C2E-8513-40E6-921B-08AEFD7CBDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {6ADF0C2E-8513-40E6-921B-08AEFD7CBDD6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {650C222B-1BE3-4F5E-970A-96B78002B741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {650C222B-1BE3-4F5E-970A-96B78002B741}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {650C222B-1BE3-4F5E-970A-96B78002B741}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {650C222B-1BE3-4F5E-970A-96B78002B741}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A5060B44-96C5-4B01-A024-C7310386F118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A5060B44-96C5-4B01-A024-C7310386F118}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A5060B44-96C5-4B01-A024-C7310386F118}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A5060B44-96C5-4B01-A024-C7310386F118}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/Android/Guava/build.cake b/Android/Guava/build.cake
@@ -2,16 +2,16 @@
 
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var GUAVA_VERSION_BASE = "29.0";
+var GUAVA_VERSION_BASE = "31.1";
 var GUAVA_VERSION = GUAVA_VERSION_BASE + "-android";
 var GUAVA_FAILUREACCESS_VERSION = "1.0.1";
 var GUAVA_LISTENABLEFUTURE_VERSION = "1.0";
 
 var JSR305_VERSION = "3.0.2";
 var CHECKER_COMPAT_QUAL_VERSION = "2.5.5";
-var ERROR_PRONE_ANNOTATIONS_VERSION = "2.3.3";
+var ERROR_PRONE_ANNOTATIONS_VERSION = "2.3.4";
 var J2OBJC_ANNOTATIONS_VERSION = "1.3";
-var ANIMAL_SNIFFER_ANNOTATIONS_VERSION = "1.17";
+var ANIMAL_SNIFFER_ANNOTATIONS_VERSION = "1.19";
 
 var GUAVA_JAR_URL = string.Format ("http://search.maven.org/remotecontent?filepath=com/google/guava/guava/{0}/guava-{0}.jar", GUAVA_VERSION);
 var GUAVA_DOCS_URL = string.Format ("http://search.maven.org/remotecontent?filepath=com/google/guava/guava/{0}/guava-{0}-javadoc.jar", GUAVA_VERSION);

diff --git a/Android/Guava/cgmanifest.json b/Android/Guava/cgmanifest.json
@@ -6,7 +6,7 @@
  "Maven": {
  "ArtifactId": "guava",
  "GroupId": "com.google.guava",
- "Version": "28.2-android"
+ "Version": "31.1-android"
  }
  }
  },

diff --git a/Android/Guava/samples/NuGet.config b/Android/Guava/samples/NuGet.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <packageSources>
+ <clear />
  <add key="local-output" value="../output" />
+ <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
  </packageSources>
 </configuration>
diff --git a/Android/Guava/source/Guava.FailureAccess/Guava.FailureAccess.csproj b/Android/Guava/source/Guava.FailureAccess/Guava.FailureAccess.csproj
@@ -4,7 +4,9 @@
  <IsBindingProject>true</IsBindingProject>
  <AssemblyName>Xamarin.Google.Guava.FailureAccess</AssemblyName>
  <RootNamespace>Guava.FailureAccess</RootNamespace>
+ <!--
  <Java7DocPaths>..\..\externals\guava-failureaccess-javadocs\</Java7DocPaths>
+ -->
  </PropertyGroup>
 
  <PropertyGroup>

diff --git a/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.csproj b/Android/Guava/source/Guava.ListenableFuture/Guava.ListenableFuture.csproj
@@ -4,7 +4,9 @@
  <IsBindingProject>true</IsBindingProject>
  <AssemblyName>Xamarin.Google.Guava.ListenableFuture</AssemblyName>
  <RootNamespace>Guava.ListenableFuture</RootNamespace>
+ <!--
  <Java7DocPaths>..\..\externals\guava-listenablefuture-javadocs\</Java7DocPaths>
+ -->
  </PropertyGroup>
 
  <PropertyGroup>

diff --git a/Android/Guava/source/Guava/Guava.csproj b/Android/Guava/source/Guava/Guava.csproj
@@ -4,7 +4,9 @@
  <IsBindingProject>true</IsBindingProject>
  <AssemblyName>Xamarin.Google.Guava</AssemblyName>
  <RootNamespace>Guava</RootNamespace>
+ <!--
  <Java7DocPaths>..\..\externals\guava-javadocs\</Java7DocPaths>
+ -->
  </PropertyGroup>
 
  <PropertyGroup>
@@ -28,18 +30,25 @@ Guava is a set of core libraries that includes new collection types (such as mul
  </PropertyGroup>
 
  <ItemGroup>
- <None Include="Guava.targets" Pack="True" PackagePath="@(_TfmNuGetBuildFolders->'%(Identity)$(PackageId).targets')" />
+ <None Include="Guava.targets" Pack="True" PackagePath="@(_TfmNuGetBuildFolders-&gt;'%(Identity)$(PackageId).targets')" />
  <None Include="..\..\externals\guava.jar" Pack="True" PackagePath="jar" />
  <None Include="..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
  </ItemGroup>
 
  <ItemGroup>
  <ProjectReference Include="..\Guava.FailureAccess\Guava.FailureAccess.csproj" PrivateAssets="None" />
  <ProjectReference Include="..\Guava.ListenableFuture\Guava.ListenableFuture.csproj" PrivateAssets="None" />
+ <ProjectReference Include="..\Xamarin.CheckerFramework.CheckerCompatQual\Xamarin.CheckerFramework.CheckerCompatQual.csproj" />
+ <ProjectReference Include="..\Xamarin.Google.J2Objc.Annotations\Xamarin.Google.J2Objc.Annotations.csproj" />
  </ItemGroup>
 
  <ItemGroup>
  <InputJar Include="..\..\externals\guava.jar" />
  </ItemGroup>
 
+ <ItemGroup>
+ <PackageReference Include="Xamarin.Google.Code.FindBugs.JSR305" Version="3.0.2.2" />
+ <PackageReference Include="Xamarin.Google.ErrorProne.Annotations" Version="2.4.0.1" />
+ <PackageReference Include="Xamarin.CodeHaus.Mojo.AnimalSnifferAnnotations" Version="1.18.0.1" />
+ </ItemGroup>
 </Project>
diff --git a/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Transforms/Transforms.xml b/Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Transforms/Transforms.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<metadata>
+ <remove-node path="/api/package" />
+</metadata>
diff --git a/...arin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.csproj b/...arin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Xamarin.Legacy.Sdk">
+ <PropertyGroup>
+ <TargetFrameworks>net6.0-android;monoandroid90</TargetFrameworks>
+ <IsBindingProject>true</IsBindingProject>
+ <AssemblyName>Xamarin.CheckerFramework.CheckerCompatQual</AssemblyName>
+ <RootNamespace>Xamarin.CheckerFramework.CheckerCompatQual</RootNamespace>
+ <!--
+ <Java7DocPaths>..\..\externals\guava-javadocs\</Java7DocPaths>
+ -->
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <PackageId>Xamarin.CheckerFramework.CheckerCompatQual</PackageId>
+ <Title>Xamarin.CheckerFramework.CheckerCompatQual</Title>
+ <PackageDescription>
+ Xamarin.CheckerFramework.CheckerCompatQual
+ </PackageDescription>
+ <Authors>Microsoft</Authors>
+ <Owners>Microsoft</Owners>
+ <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+ <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=865028</PackageProjectUrl>
+ <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=865030</PackageLicenseUrl>
+ <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+ <PackageVersion>2.5.5</PackageVersion>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <None Include="Xamarin.CheckerFramework.CheckerCompatQual.targets" Pack="True" PackagePath="@(_TfmNuGetBuildFolders-&gt;'%(Identity)$(PackageId).targets')" />
+ <None Include="..\..\externals\checker-compat-qual-annotations.jar" Pack="True" PackagePath="jar" />
+ <None Include="..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <InputJar Include="..\..\externals\checker-compat-qual-annotations.jar" />
+ </ItemGroup>
+
+</Project>
diff --git a/...rin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.targets b/...rin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <AndroidJavaLibrary Condition=" '$(AndroidApplication)' == 'true' " Include="$(MSBuildThisFileDirectory)..\..\jar\*.jar" />
+ </ItemGroup>
+</Project>
diff --git a/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Transforms/Transforms.xml b/Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Transforms/Transforms.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<metadata>
+ <remove-node path="/api/package" />
+</metadata>
diff --git a/...d/Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.csproj b/...d/Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Xamarin.Legacy.Sdk">
+ <PropertyGroup>
+ <TargetFrameworks>net6.0-android;monoandroid90</TargetFrameworks>
+ <IsBindingProject>true</IsBindingProject>
+ <AssemblyName>Xamarin.Google.J2Objc.Annotations</AssemblyName>
+ <RootNamespace>Xamarin.Google.J2Objc.Annotations</RootNamespace>
+ <!--
+ <Java7DocPaths>..\..\externals\guava-javadocs\</Java7DocPaths>
+ -->
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <PackageId>Xamarin.Google.J2Objc.Annotations</PackageId>
+ <Title>Xamarin.Google.J2Objc.Annotations</Title>
+ <PackageDescription>
+ Xamarin.Google.J2Objc.Annotations
+ </PackageDescription>
+ <Authors>Microsoft</Authors>
+ <Owners>Microsoft</Owners>
+ <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+ <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=865028</PackageProjectUrl>
+ <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=865030</PackageLicenseUrl>
+ <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+ <PackageVersion>1.3.0</PackageVersion>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <None Include="Xamarin.Google.J2Objc.Annotations.targets" Pack="True" PackagePath="@(_TfmNuGetBuildFolders-&gt;'%(Identity)$(PackageId).targets')" />
+ <None Include="..\..\externals\j2objc-annotations.jar" Pack="True" PackagePath="jar" />
+ <None Include="..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <InputJar Include="..\..\externals\j2objc-annotations.jar" />
+ </ItemGroup>
+
+</Project>
diff --git a/.../Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.targets b/.../Guava/source/Xamarin.Google.J2Objc.Annotations/Xamarin.Google.J2Objc.Annotations.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <AndroidJavaLibrary Condition=" '$(AndroidApplication)' == 'true' " Include="$(MSBuildThisFileDirectory)..\..\jar\*.jar" />
+ </ItemGroup>
+</Project>
diff --git a/Android/SquareMoshiAdapters/build.cake b/Android/SquareMoshiAdapters/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-adapters/{JAR_VERSION}/moshi-adapters-{JAR_VERSION}.jar";
 
 Task ("externals")

diff --git a/Android/SquareMoshiAdapters/cgmanifest.json b/Android/SquareMoshiAdapters/cgmanifest.json
@@ -6,7 +6,7 @@
  "Maven": {
  "ArtifactId": "moshi-adapters",
  "GroupId": "com.squareup.moshi",
- "Version": "1.12.0",
+ "Version": "1.13.0",
  "NuGetId": "Square.Moshi.Adapters"
  }
  }

diff --git a/Android/SquareMoshiAdapters/source/Square.Moshi.Adapters/Square.Moshi.Adapters.csproj b/Android/SquareMoshiAdapters/source/Square.Moshi.Adapters/Square.Moshi.Adapters.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
  <PropertyGroup>
- <TargetFrameworks>monoandroid9.0</TargetFrameworks>
+ <TargetFrameworks>monoandroid12.0</TargetFrameworks>
  <IsBindingProject>true</IsBindingProject>
  <AssemblyName>Square.Moshi.Adapters</AssemblyName>
  <RootNamespace>Square.Moshi.Adapters</RootNamespace>
@@ -23,12 +23,12 @@
  <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
  <PackageTags>moshi adapters xamarin android monodroid</PackageTags>
- <PackageVersion>1.12.0</PackageVersion>
+ <PackageVersion>1.13.0</PackageVersion>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Square.Moshi" Version="1.12.0" />
- <PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.4.32.1" />
+ <PackageReference Include="Square.Moshi" Version="1.13.0" />
+ <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.6.10" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/Android/SquareOkHttp3/build.cake b/Android/SquareOkHttp3/build.cake
@@ -1,7 +1,7 @@
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-string NUGET_VERSION = "4.9.2";
-string JAR_VERSION = "4.9.2";
+string NUGET_VERSION = "4.9.3";
+string JAR_VERSION = "4.9.3";
 string JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/{JAR_VERSION}/okhttp-{JAR_VERSION}.jar";
 
 Task ("externals")