1.14 -> 1.15

xamarin · Mar 7, 2020 · 9e86d81 · 9e86d81
1 parent 7ab6525
commit 9e86d81
Show file tree

Hide file tree

Showing 19 changed files with 386 additions and 97 deletions.
diff --git a/Android/SceneForm/SceneForm.sln b/Android/SceneForm/SceneForm.sln
@@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rendering", "source\Renderi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UX", "source\UX\UX.csproj", "{ACECE654-15B5-4B2B-BF1E-14CA3D0FC6CA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UX.AndroidX", "source\UX.AndroidX\UX.AndroidX.csproj", "{08501CBB-A95A-42E8-A53F-FE87BDF0F5B8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +57,10 @@ Global
 		{5C856B2B-C3FD-4349-A319-D1A7B12A5B0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C856B2B-C3FD-4349-A319-D1A7B12A5B0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C856B2B-C3FD-4349-A319-D1A7B12A5B0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08501CBB-A95A-42E8-A53F-FE87BDF0F5B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08501CBB-A95A-42E8-A53F-FE87BDF0F5B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08501CBB-A95A-42E8-A53F-FE87BDF0F5B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08501CBB-A95A-42E8-A53F-FE87BDF0F5B8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Android/SceneForm/build.cake b/Android/SceneForm/build.cake
@@ -1,10 +1,10 @@
 #addin nuget:?package=SharpZipLib
 
-var TARGET = Argument ("t", Argument ("target", "Default"));
+var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var SF_VERSION = "1.11.0";
+var SF_VERSION = "1.15.0";
 
-var NUGET_VERSION = "1.11.0";
+var NUGET_VERSION = "1.15.0";
 
 var BASE_JAR_URL = $"https://dl.google.com/dl/android/maven2/com/google/ar/sceneform/sceneform-base/{SF_VERSION}/sceneform-base-{SF_VERSION}.aar";
 var ANIMATION_JAR_URL = $"https://dl.google.com:443/dl/android/maven2/com/google/ar/sceneform/animation/{SF_VERSION}/animation-{SF_VERSION}.aar";
@@ -94,4 +94,14 @@ Task ("clean")
 		DeleteDirectory ("./externals", true);
 });
 
+Task ("ci")
+	.IsDependentOn("libs")
+	.IsDependentOn("nuget")
+	.Does 
+	(
+		() =>
+		{
+		}
+	);
+
 RunTarget (TARGET);
diff --git a/Android/SceneForm/samples/hellosceneform/hellosceneform.csproj b/Android/SceneForm/samples/hellosceneform/hellosceneform.csproj
@@ -23,6 +23,7 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidEnableDesugar>true</AndroidEnableDesugar>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -35,10 +36,6 @@
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
     <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
-    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <BundleAssemblies>false</BundleAssemblies>
     <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
     <MandroidI18n />
   </PropertyGroup>
@@ -54,7 +51,6 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -96,11 +92,11 @@
     <AndroidResource Include="Resources\raw\andy.sfb" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.Fragment" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Google.ARCore" Version="1.11.0" />
+    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Android.Support.Fragment" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Google.ARCore" Version="1.15.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\source\Animation\Animation.csproj">

diff --git a/Android/SceneForm/source/Animation/Animation.csproj b/Android/SceneForm/source/Animation/Animation.csproj
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFramework>MonoAndroid81</TargetFramework>
+    <TargetFramework>MonoAndroid90</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.SceneForm.Animation</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -12,6 +11,11 @@
     <RootNamespace>Xamarin.Android.SceneForm.Animation</RootNamespace>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
+    <EnableProguard>true</EnableProguard>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,7 +28,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>1.11.0</PackageVersion>
+    <PackageVersion>1.15.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Android/SceneForm/source/Assets/Assets.csproj b/Android/SceneForm/source/Assets/Assets.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
     <TargetFramework>MonoAndroid81</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
@@ -12,6 +11,11 @@
     <RootNamespace>Xamarin.Android.SceneForm.Assets</RootNamespace>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
+    <EnableProguard>true</EnableProguard>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,7 +28,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>1.11.0</PackageVersion>
+    <PackageVersion>1.15.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Android/SceneForm/source/Base/Base.csproj b/Android/SceneForm/source/Base/Base.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
     <TargetFramework>MonoAndroid81</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
@@ -12,6 +11,11 @@
     <RootNamespace>Xamarin.Android.SceneForm.Base</RootNamespace>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
+    <EnableProguard>true</EnableProguard>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,7 +28,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>1.11.0</PackageVersion>
+    <PackageVersion>1.15.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Android/SceneForm/source/Core/Core.csproj b/Android/SceneForm/source/Core/Core.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
     <TargetFramework>MonoAndroid81</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
@@ -12,6 +11,11 @@
     <RootNamespace>Xamarin.Android.SceneForm.Core</RootNamespace>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
+    <EnableProguard>true</EnableProguard>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,7 +28,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>1.11.0</PackageVersion>
+    <PackageVersion>1.15.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Android/SceneForm/source/Filament/Filament.csproj b/Android/SceneForm/source/Filament/Filament.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
     <TargetFramework>MonoAndroid81</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
@@ -12,6 +11,11 @@
     <RootNamespace>Xamarin.Android.SceneForm.Filament</RootNamespace>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
+    <EnableProguard>true</EnableProguard>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,7 +28,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>1.11.0</PackageVersion>
+    <PackageVersion>1.15.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Android/SceneForm/source/Rendering/ModelRenderableBuilder.cs b/Android/SceneForm/source/Rendering/ModelRenderableBuilder.cs
@@ -12,37 +12,37 @@ 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>();
-                rbuilder.SetSource(context, resource);
+            //public unsafe ModelRenderable.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 ModelRenderable.Builder SetSource(global::Android.Content.Context context, global::Android.Net.Uri sourceUri)
-            {
-                var rbuilder = this.JavaCast<Renderable.Builder>();
-                rbuilder.SetSource(context, sourceUri);
+            //public unsafe ModelRenderable.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 ModelRenderable.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 ModelRenderable.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 ModelRenderable.Builder SetSource(global::Google.AR.Sceneform.Rendering.RenderableDefinition definition)
-            {
-                var rbuilder = this.JavaCast<Renderable.Builder>();
-                rbuilder.SetSource(definition);
+            //public unsafe ModelRenderable.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<ModelRenderable> completionAction)
             {

diff --git a/Android/SceneForm/source/Rendering/Rendering.csproj b/Android/SceneForm/source/Rendering/Rendering.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
+<Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
     <TargetFramework>MonoAndroid81</TargetFramework>
     <IsBindingProject>true</IsBindingProject>
@@ -12,6 +11,11 @@
     <RootNamespace>Xamarin.Android.SceneForm.Rendering</RootNamespace>
     <AndroidClassParser>class-parse</AndroidClassParser>
     <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
+    <EnableProguard>true</EnableProguard>
+    <AndroidEnableMultiDex>true</AndroidEnableMultiDex>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,7 +28,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>1.11.0</PackageVersion>
+    <PackageVersion>1.15.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -47,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Google.ARCore" Version="1.11.0" />
+    <PackageReference Include="Xamarin.Google.ARCore" Version="1.15.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Android/SceneForm/source/Rendering/Transforms/Metadata.xml b/Android/SceneForm/source/Rendering/Transforms/Metadata.xml
@@ -33,7 +33,12 @@
 
     <!--<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='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']]"
+        />
+
 </metadata>