Merge branch 'main' into antonioseric-KotlinxCoroutines-1.4.1

moljac · web-flow · commit cd0c693c40ae · 2021-05-13T17:34:38.000+02:00
diff --git a/Android/SceneForm/samples/HelloSceneForm/HelloSceneForm.csproj b/Android/SceneForm/samples/HelloSceneForm/HelloSceneForm.csproj
@@ -35,9 +35,10 @@
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
-    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
     <MandroidI18n />
+<AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>PdbOnly</DebugType>
@@ -133,6 +134,9 @@
     <Folder Include="Resources\menu\" />
     <Folder Include="Resources\mipmap-anydpi-v26\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProguardConfiguration Include="proguard.cfg" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
     Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Android/SceneForm/samples/HelloSceneForm/HelloSceneformActivity.cs b/Android/SceneForm/samples/HelloSceneForm/HelloSceneformActivity.cs
@@ -36,7 +36,7 @@ protected override void OnCreate(Bundle savedInstanceState)
             arFragment = (ArFragment)SupportFragmentManager.FindFragmentById(Resource.Id.ux_fragment);
 
             //load and build the model
-            ModelRenderable.InvokeBuilder().SetSource(this, Resource.Raw.andy).Build(((renderable) =>
+            ((ModelRenderable.Builder) ModelRenderable.InvokeBuilder().SetSource(this, Resource.Raw.andy)).Build(((renderable) =>
             {
                 andyRenderable = renderable;
 
diff --git a/Android/SceneForm/samples/HelloSceneForm/proguard.cfg b/Android/SceneForm/samples/HelloSceneForm/proguard.cfg
@@ -0,0 +1,13 @@
+﻿-dontshrink
+-dontoptimize
+-dontpreverify
+
+-keep public class com.google.ar.sceneform.rendering.ModelRenderable { *; }
+-keepnames class com.google.ar.sceneform.rendering.ModelRenderable { }
+-keepclassmembers class com.google.ar.sceneform.rendering.ModelRenderable { }
+
+-keep public class com.google.ar.sceneform.rendering.ModelRenderable.Builder { *; }
+-keepnames class com.google.ar.sceneform.rendering.ModelRenderable.Builder { }
+-keepclassmembers class com.google.ar.sceneform.rendering.ModelRenderable.Builder { }
+
+-keep public class com.google.ar.sceneform.ux.ArFragment { *; }
diff --git a/Android/SceneForm/source/Animation/Animation.csproj b/Android/SceneForm/source/Animation/Animation.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
diff --git a/Android/SceneForm/source/Assets/Assets.csproj b/Android/SceneForm/source/Assets/Assets.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
diff --git a/Android/SceneForm/source/Base/Base.csproj b/Android/SceneForm/source/Base/Base.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
diff --git a/Android/SceneForm/source/Core/Core.csproj b/Android/SceneForm/source/Core/Core.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
diff --git a/Android/SceneForm/source/Filament/Filament.csproj b/Android/SceneForm/source/Filament/Filament.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
diff --git a/Android/SceneForm/source/Rendering/ModelRenderableBuilder.cs b/Android/SceneForm/source/Rendering/ModelRenderableBuilder.cs
@@ -12,7 +12,6 @@ public partial class ModelRenderable
     {
         public partial class Builder
         {
-            /*
             public unsafe ModelRenderable.Builder SetSource(global::Android.Content.Context context, int resource)
             {
                 var rbuilder = this.JavaCast<Renderable.Builder>();
@@ -44,7 +43,6 @@ public unsafe ModelRenderable.Builder SetSource(global::Google.AR.Sceneform.Rend
 
                 return this;
             }
-            */
 
             public void Build(Action<ModelRenderable> completionAction)
             {
diff --git a/Android/SceneForm/source/Rendering/Rendering.csproj b/Android/SceneForm/source/Rendering/Rendering.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
diff --git a/Android/SceneForm/source/Rendering/Transforms/Metadata.xml b/Android/SceneForm/source/Rendering/Transforms/Metadata.xml
@@ -1,81 +1,56 @@
 ﻿<metadata>
-    
-       
-    <attr path="/api/package[@name='com.google.ar.sceneform.rendering']" name="managedName">Google.AR.Sceneform.Rendering</attr>
-    
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='makeRenderable' and count(parameter)=0]" />
-    
-    <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ViewRenderable']/method[@name='makeCopy' and count(parameter)=0]" name="return">Google.AR.Sceneform.Rendering.Renderable</attr>
-    <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable']/method[@name='makeCopy' and count(parameter)=0]" name="return">Google.AR.Sceneform.Rendering.Renderable</attr>
-    
-    <!--<attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='android.net.Uri']]" name="return">Java.Lang.Object</attr>   
+
+
+  <attr path="/api/package[@name='com.google.ar.sceneform.rendering']" name="managedName">Google.AR.Sceneform.Rendering</attr>
+
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='makeRenderable' and count(parameter)=0]" />
+
+  <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ViewRenderable']/method[@name='makeCopy' and count(parameter)=0]" name="return">Google.AR.Sceneform.Rendering.Renderable</attr>
+  <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable']/method[@name='makeCopy' and count(parameter)=0]" name="return">Google.AR.Sceneform.Rendering.Renderable</attr>
+
+  <!--<attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='android.net.Uri']]" name="return">Java.Lang.Object</attr>   
     <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.util.concurrent.Callable&lt;java.io.InputStream&gt;']]" name="return">Java.Lang.Object</attr>
     <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=1 and parameter[1][@type='com.google.ar.sceneform.rendering.RenderableDefinition']]" name="return">Java.Lang.Object</attr>-->
 
-    <!--<remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='android.net.Uri']]" />
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.util.concurrent.Callable&lt;java.io.InputStream&gt;']]" />
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=1 and parameter[1][@type='com.google.ar.sceneform.rendering.RenderableDefinition']]" />
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='int']]" />-->
-  
-    <!--<attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='int']]" name="return">Java.Lang.Object</attr>-->
-  
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='getSelf' and count(parameter)=0]" />
-
-     
-    <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setRegistryId' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" name="return">Java.Lang.Object</attr>
-    
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ViewRenderable.Builder']/method[@name='makeRenderable' and @return='com.google.ar.sceneform.rendering.ViewRenderable' and count(parameter)=0]" />
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable.Builder']/method[@name='makeRenderable' and @return='com.google.ar.sceneform.rendering.ModelRenderable' and count(parameter)=0]" />
-    
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/interface[@name='Light.LightChangedListener']" />
-  
-    <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable']/method[@name='makeCopy' and count(parameter)=0]" name="final">true</attr>
-    
-    <!--<remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ViewRenderable.Builder']/method[@name='build' and count(parameter)=0]" />-->
-  
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='build' and count(parameter)=0]" />
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='getRenderableClass' and count(parameter)=0]" />
-    <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='getRenderableRegistry' and count(parameter)=0]" />
-    
-    <remove-node
-        path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setRegistryId' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]"
-        />
-    <attr
-        path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='android.net.Uri']]"
-        name="managedReturn"
-        >
-        Java.Lang.Object
-    </attr>
-    <attr
-        path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable.Builder']/method[@name='setSource' and count(parameter)=3 and parameter[1][@type='android.content.Context'] and parameter[2][@type='android.net.Uri'] and parameter[3][@type='boolean']]"
-        name="managedReturn"
-        >
-        Google.AR.Sceneform.Rendering.ModelRenderable.Builder
-    </attr>
-    <attr
-        path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='int']]"
-        name="managedReturn"
-        >
-        Google.AR.Sceneform.Rendering.ModelRenderable.Builder
-    </attr>
-    <attr
-        path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.util.concurrent.Callable']]"
-        name="managedReturn"
-        >
-        Google.AR.Sceneform.Rendering.ModelRenderable.Builder
-    </attr>
-    
-    <attr
+  <!--<remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='android.net.Uri']]" />
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.util.concurrent.Callable&lt;java.io.InputStream&gt;']]" />
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=1 and parameter[1][@type='com.google.ar.sceneform.rendering.RenderableDefinition']]" />
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='int']]" />-->
+
+  <!--<attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setSource' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='int']]" name="return">Java.Lang.Object</attr>-->
+
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable.Builder']/method[@name='setSource']" />
+
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ViewRenderable.Builder']/method[@name='setSource']" />
+
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='getSelf' and count(parameter)=0]" />
+
+
+  <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='setRegistryId' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" name="return">Java.Lang.Object</attr>
+
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ViewRenderable.Builder']/method[@name='makeRenderable' and @return='com.google.ar.sceneform.rendering.ViewRenderable' and count(parameter)=0]" />
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable.Builder']/method[@name='makeRenderable' and @return='com.google.ar.sceneform.rendering.ModelRenderable' and count(parameter)=0]" />
+
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/interface[@name='Light.LightChangedListener']" />
+
+  <attr path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ModelRenderable']/method[@name='makeCopy' and count(parameter)=0]" name="final">true</attr>
+
+  <!--<remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='ViewRenderable.Builder']/method[@name='build' and count(parameter)=0]" />-->
+
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='build' and count(parameter)=0]" />
+  <remove-node path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']/method[@name='getRenderableClass' and count(parameter)=0]" />
+
+  <attr
         path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='EnvironmentalHdrLightEstimate.CubeMapImage']"
         name="visibility"
         >
-        public        
-    </attr>
-    <attr
-        path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']"
-        name="visibility"
+    public
+  </attr>
+  <attr
+      path="/api/package[@name='com.google.ar.sceneform.rendering']/class[@name='Renderable.Builder']"
+      name="visibility"
         >
-        public        
-    </attr>
-    
-</metadata>
+    public
+  </attr>
+
+</metadata>
diff --git a/Android/SceneForm/source/Rendering/ViewRenderableBuilder.cs b/Android/SceneForm/source/Rendering/ViewRenderableBuilder.cs
@@ -11,37 +11,37 @@ public partial class ViewRenderable
     {
         public partial class Builder
         {
-            //public unsafe ViewRenderable.Builder SetSource(global::Android.Content.Context context, int resource)
-            //{
-            //    var rbuilder = this.JavaCast<Renderable.Builder>();
-            //    rbuilder.SetSource(context, resource);
+            public unsafe ViewRenderable.Builder SetSource(global::Android.Content.Context context, int resource)
+            {
+                var rbuilder = this.JavaCast<Renderable.Builder>();
+                rbuilder.SetSource(context, resource);
 
-            //    return this;
-            //}
+                return this;
+            }
 
-            //public unsafe ViewRenderable.Builder SetSource(global::Android.Content.Context context, global::Android.Net.Uri sourceUri)
-            //{
-            //    var rbuilder = this.JavaCast<Renderable.Builder>();
-            //    rbuilder.SetSource(context, sourceUri);
+            public unsafe ViewRenderable.Builder SetSource(global::Android.Content.Context context, global::Android.Net.Uri sourceUri)
+            {
+                var rbuilder = this.JavaCast<Renderable.Builder>();
+                rbuilder.SetSource(context, sourceUri);
 
-            //    return this;
-            //}
+                return this;
+            }
 
-            //public unsafe ViewRenderable.Builder SetSource(global::Android.Content.Context context, global::Java.Util.Concurrent.ICallable inputStreamCreator)
-            //{
-            //    var rbuilder = this.JavaCast<Renderable.Builder>();
-            //    rbuilder.SetSource(context, inputStreamCreator);
+            public unsafe ViewRenderable.Builder SetSource(global::Android.Content.Context context, global::Java.Util.Concurrent.ICallable inputStreamCreator)
+            {
+                var rbuilder = this.JavaCast<Renderable.Builder>();
+                rbuilder.SetSource(context, inputStreamCreator);
 
-            //    return this;
-            //}
+                return this;
+            }
 
-            //public unsafe ViewRenderable.Builder SetSource(global::Google.AR.Sceneform.Rendering.RenderableDefinition definition)
-            //{
-            //    var rbuilder = this.JavaCast<Renderable.Builder>();
-            //    rbuilder.SetSource(definition);
+            public unsafe ViewRenderable.Builder SetSource(global::Google.AR.Sceneform.Rendering.RenderableDefinition definition)
+            {
+                var rbuilder = this.JavaCast<Renderable.Builder>();
+                rbuilder.SetSource(definition);
 
-            //    return this;
-            //}
+                return this;
+            }
 
             public void Build(Action<ViewRenderable> completionAction)
             {
diff --git a/Android/SceneForm/source/UX/UX.csproj b/Android/SceneForm/source/UX/UX.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+﻿<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
diff --git a/Android/SquareMoshi/build.cake b/Android/SquareMoshi/build.cake
@@ -1,8 +1,8 @@
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var NUGET_VERSION = "1.11.0";
+var NUGET_VERSION = "1.12.0";
 
-var JAR_VERSION = "1.11.0";
+var JAR_VERSION = "1.12.0";
 var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/moshi/moshi/{JAR_VERSION}/moshi-{JAR_VERSION}.jar";
 
 Task ("externals")
diff --git a/Android/SquareMoshi/cgmanifest.json b/Android/SquareMoshi/cgmanifest.json
@@ -6,7 +6,7 @@
         "Maven": {
           "ArtifactId": "moshi",
           "GroupId": "com.squareup.moshi",
-          "Version": "1.11.0",
+          "Version": "1.12.0",
           "NuGetId": "Square.Moshi"
         }
       }
diff --git a/Android/SquareMoshi/source/Square.Moshi/Square.Moshi.csproj b/Android/SquareMoshi/source/Square.Moshi/Square.Moshi.csproj
@@ -23,11 +23,12 @@
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>moshi xamarin android monodroid</PackageTags>
-    <PackageVersion>1.11.0</PackageVersion>
+    <PackageVersion>1.12.0</PackageVersion>
   </PropertyGroup>
     
   <ItemGroup>
-    <PackageReference Include="Square.OkiO" Version="2.4.3" />
+    <PackageReference Include="Square.OkiO" Version="2.10.0" />
+    <PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.4.32.1" />
   </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"));
 
-var NUGET_VERSION = "4.9.0";
-var JAR_VERSION = "4.9.0";
+var NUGET_VERSION = "4.9.1";
+var JAR_VERSION = "4.9.1";
 var JAR_URL = $"https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/{JAR_VERSION}/okhttp-{JAR_VERSION}.jar";
 
 Task ("externals")
diff --git a/Android/SquareOkHttp3/cgmanifest.json b/Android/SquareOkHttp3/cgmanifest.json
diff --git a/Android/SquareOkHttp3/samples/OkHttp3Sample/Resources/Resource.Designer.cs b/Android/SquareOkHttp3/samples/OkHttp3Sample/Resources/Resource.Designer.cs
diff --git a/Android/SquareOkHttp3/source/Square.OkHttp3/Square.OkHttp3.csproj b/Android/SquareOkHttp3/source/Square.OkHttp3/Square.OkHttp3.csproj
diff --git a/Android/ThreeTenAbp/build.cake b/Android/ThreeTenAbp/build.cake
diff --git a/Android/ThreeTenAbp/cgmanifest.json b/Android/ThreeTenAbp/cgmanifest.json
diff --git a/Android/ThreeTenAbp/source/ThreeTenAbp/ThreeTenAbp.csproj b/Android/ThreeTenAbp/source/ThreeTenAbp/ThreeTenAbp.csproj

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected override void OnCreate(Bundle savedInstanceState)`
`36`	`36`	`arFragment = (ArFragment)SupportFragmentManager.FindFragmentById(Resource.Id.ux_fragment);`
`37`	`37`
`38`	`38`	`//load and build the model`
`39`		`- ModelRenderable.InvokeBuilder().SetSource(this, Resource.Raw.andy).Build(((renderable) =>`
	`39`	`+ ((ModelRenderable.Builder) ModelRenderable.InvokeBuilder().SetSource(this, Resource.Raw.andy)).Build(((renderable) =>`
`40`	`40`	`{`
`41`	`41`	`andyRenderable = renderable;`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">`
	`1`	`+<Project Sdk="MSBuild.Sdk.Extras/3.0.23">`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<TargetFramework>MonoAndroid90</TargetFramework>`
`4`	`4`	`<IsBindingProject>true</IsBindingProject>`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ public partial class ModelRenderable`
`12`	`12`	`{`
`13`	`13`	`public partial class Builder`
`14`	`14`	`{`
`15`		`- /*`
`16`	`15`	`public unsafe ModelRenderable.Builder SetSource(global::Android.Content.Context context, int resource)`
`17`	`16`	`{`
`18`	`17`	`var rbuilder = this.JavaCast<Renderable.Builder>();`
`@@ -44,7 +43,6 @@ public unsafe ModelRenderable.Builder SetSource(global::Google.AR.Sceneform.Rend`
`44`	`43`
`45`	`44`	`return this;`
`46`	`45`	`}`
`47`		`- */`
`48`	`46`
`49`	`47`	`public void Build(Action<ModelRenderable> completionAction)`
`50`	`48`	`{`