Merge branch 'main' into feature/audioswitch-1.1.4

xamarin · Mar 10, 2022 · 25baf9e · 25baf9e
2 parents 6c30e6f + 81f7385
commit 25baf9e
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 60 deletions.
diff --git a/Android/ARCore/build.cake b/Android/ARCore/build.cake
@@ -2,27 +2,37 @@
 
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var NUGET_VERSION = "1.26.0";
+var NUGET_VERSION = "1.29.0";
 
-var AAR_VERSION = "1.26.0";
+var AAR_VERSION = "1.29.0";
 var AAR_URL = string.Format("https://dl.google.com/dl/android/maven2/com/google/ar/core/{0}/core-{0}.aar", AAR_VERSION);
 var OBJ_VERSION = "0.3.0";
 var OBJ_URL = string.Format("https://oss.sonatype.org/content/repositories/releases/de/javagl/obj/{0}/obj-{0}.jar", OBJ_VERSION);
 
 Task ("externals")
  .Does (() =>
 {
- var AAR_FILE = "./externals/arcore.aar";
- var OBJ_JAR_FILE = "./externals/obj.jar";
+ var AAR_FILE = string.Format("./externals/arcore-{0}.aar", AAR_VERSION);
+ var OBJ_JAR_FILE = string.Format("./externals/obj-{0}.jar", OBJ_VERSION);;
 
  if (!DirectoryExists ("./externals/"))
  CreateDirectory ("./externals");
 
  if (!FileExists (AAR_FILE))
+ {
  DownloadFile (AAR_URL, AAR_FILE);
+ if(FileExists ("./externals/arcore.aar"))
+ DeleteFile("./externals/arcore.aar");
+ CopyFile(AAR_FILE, "./externals/arcore.aar");
+ }
 
  if (!FileExists (OBJ_JAR_FILE))
+ {
  DownloadFile (OBJ_URL, OBJ_JAR_FILE);
+ if(FileExists ("./externals/obj.aar"))
+ DeleteFile("./externals/obj.aar");
+ CopyFile(OBJ_JAR_FILE, "./externals/obj.jar");
+ }
 });
 
 Task("libs")

diff --git a/Android/ARCore/source/Additions/Additions.cs b/Android/ARCore/source/Additions/Additions.cs
@@ -1 +1,13 @@
-
+using System;
+
+namespace Google.AR.Core
+{
+ // Add ITrackable interface
+ // https://developers.google.com/ar/reference/java/com/google/ar/core/Trackable
+ public partial class AugmentedFace : Google.AR.Core.ITrackable {}
+ public partial class AugmentedImage : Google.AR.Core.ITrackable {}
+ public partial class DepthPoint : Google.AR.Core.ITrackable {}
+ public partial class InstantPlacementPoint : Google.AR.Core.ITrackable {}
+ public partial class Plane : Google.AR.Core.ITrackable {}
+ public partial class Point : Google.AR.Core.ITrackable {}
+}
diff --git a/Android/ARCore/source/Transforms/Metadata.xml b/Android/ARCore/source/Transforms/Metadata.xml
@@ -1,65 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
- <attr path="/api/package[@name='com.google.ar.core']" name="managedName">Google.AR.Core</attr>
- <attr path="/api/package[@name='com.google.ar.core.annotations']" name="managedName">Google.AR.Core.Annotations</attr>
- <attr path="/api/package[@name='com.google.ar.core.exceptions']" name="managedName">Google.AR.Core.Exceptions</attr>
-
- <attr path="/api/package[@name='com.google.vr.dynamite.client']" name="managedName">Google.VR.Dynamite.Client</attr>
-
- <attr path="/api/package[@name='com.google.ar.core']/class[@name='ArImage']" name="extends">Android.Media.Image</attr> 
- <attr path="/api/package[@name='com.google.vr.dynamite.client']/class[@name='ObjectWrapper']" name="extends">Java.Lang.Object</attr> 
-
-<!-- <attr path="/api/package[@name='com.google.ar.core']/class[@name='TrackableBase']" name="visibility">public</attr>-->
-
-<!-- <attr-->
-<!-- path="/api/package[@name='com.google.ar.core.services.downloads.aidl']"-->
-<!-- name="managedName"-->
-<!-- >-->
-<!-- Google.AR.Core.Services.Downloads.AIDL-->
-<!-- </attr>-->
-<!-- <attr-->
-<!-- path="/api/package[@name='com.google.ar.core.services.downloads.client']"-->
-<!-- name="managedName"-->
-<!-- >-->
-<!-- Google.AR.Core.Services.Downloads.Client-->
-<!-- </attr>-->
+ <attr path="/api/package[@name='com.google.ar.core']" name="managedName">Google.AR.Core</attr>
+ <attr path="/api/package[@name='com.google.ar.core.annotations']" name="managedName">Google.AR.Core.Annotations</attr>
+ <attr path="/api/package[@name='com.google.ar.core.exceptions']" name="managedName">Google.AR.Core.Exceptions</attr>
+ <attr path="/api/package[@name='com.google.vr.dynamite.client']" name="managedName">Google.VR.Dynamite.Client</attr>
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='ArImage']" name="extends">Android.Media.Image</attr>
+ <!-- ?? -->
+ <attr path="/api/package[@name='com.google.vr.dynamite.client']/class[@name='ObjectWrapper']" name="extends">Java.Lang.Object</attr>
+
+<!-- 
+ <attr path="/api/package[@name='com.google.ar.core.services.downloads.aidl']" name="managedName">Google.AR.Core.Services.Downloads.AIDL</attr>
+ <attr path="/api/package[@name='com.google.ar.core.services.downloads.client']" name="managedName">Google.AR.Core.Services.Downloads.Client</attr>
+-->
 
- <attr
- path="/api/package[@name='com.google.ar.core']/class[@name='InstantPlacementPoint']/method[@name='getAnchors' and count(parameter)=0]"
- name="return">
- java.util.Collection&lt;com.google.ar.core.Anchor&gt;
- </attr>
+ <!-- Missing ITrackable inheritance
+ not supported, moved into additions
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='Plane']" name="extends">Java.Lang.Object,Google.AR.Core.ITrackable</attr>
+ -->
 
- <attr
- path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedImage']/method[@name='getAnchors' and count(parameter)=0]"
- name="return">
+ <!-- 
+ ITrackable derived classes 
+ -->
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='InstantPlacementPoint']/method[@name='getAnchors' and count(parameter)=0]" name="return">
  java.util.Collection&lt;com.google.ar.core.Anchor&gt;
  </attr>
 
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedImage']/method[@name='getAnchors' and count(parameter)=0]" name="return">
+ java.util.Collection&lt;com.google.ar.core.Anchor&gt;
+ </attr>
 
- <attr
- path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]"
- name="return">
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]" name="return">
  java.util.Collection&lt;com.google.ar.core.Anchor&gt;
  </attr>
 
- <attr
- path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]"
- name="return">
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]" name="return">
  java.util.Collection&lt;com.google.ar.core.Anchor&gt;
  </attr>
 
- <attr 
- path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedFace']/method[@name='getAnchors' and count(parameter)=0]" 
- name="return"
- >
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedFace']/method[@name='getAnchors' and count(parameter)=0]" name="return">
  java.util.Collection&lt;com.google.ar.core.Anchor&gt;
- </attr>
+  </attr>
 
- <attr 
- path="/api/package[@name='com.google.ar.core']/class[@name='DepthPoint']/method[@name='getAnchors' and count(parameter)=0]"
- name="return">
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='DepthPoint']/method[@name='getAnchors' and count(parameter)=0]" name="return">
  java.util.Collection&lt;com.google.ar.core.Anchor&gt;
  </attr>
+
+ <!-- 
+ Others 
+ -->
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='InstallActivity']/method[@name='onDestroy' and count(parameter)=0]" name="managedOverride">override</attr>
+ <attr path="/api/package[@name='com.google.ar.core']/class[@name='InstallActivity']/method[@name='onDestroy' and count(parameter)=0]" name="visibility">protected</attr>
 
 </metadata>
diff --git a/Android/CoilBase/build.cake b/Android/CoilBase/build.cake
@@ -1,8 +1,8 @@
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var NUGET_VERSION = "1.3.2";
+var NUGET_VERSION = "1.4.0";
 
-var AAR_VERSION = "1.3.2";
+var AAR_VERSION = "1.4.0";
 var AAR_URL = $"https://repo1.maven.org/maven2/io/coil-kt/coil-base/{AAR_VERSION}/coil-base-{AAR_VERSION}.aar";
 
 Task ("externals")

diff --git a/Android/CoilBase/cgmanifest.json b/Android/CoilBase/cgmanifest.json
@@ -6,7 +6,7 @@
  "Maven": {
  "ArtifactId": "coil-base",
  "GroupId": "io.coil-kt",
- "Version": "1.3.2",
+ "Version": "1.4.0",
  "NuGetId": "Xamarin.Io.CoilKt.CoilBase"
  }
  }

diff --git a/Android/CoilBase/source/CoilBase/CoilBase.csproj b/Android/CoilBase/source/CoilBase/CoilBase.csproj
@@ -22,15 +22,15 @@
  <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
  <PackageTags>coil base xamarin android monodroid</PackageTags>
- <PackageVersion>1.3.2</PackageVersion>
+ <PackageVersion>1.4.0</PackageVersion>
  </PropertyGroup>
 
  <ItemGroup>
  <PackageReference Include="Xamarin.AndroidX.Lifecycle.Common.Java8" Version="2.3.1.1" />
  <PackageReference Include="Square.OkHttp3" Version="4.9.1" />
  <PackageReference Include="Square.OkIO" Version="2.10.0" />
- <PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.5.21" />
- <PackageReference Include="Xamarin.KotlinX.Coroutines.Android" Version="1.5.1" />
+ <PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.5.31" />
+ <PackageReference Include="Xamarin.KotlinX.Coroutines.Android" Version="1.5.2" />
  <PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.2.0.1" />
  <PackageReference Include="Xamarin.AndroidX.AppCompat.AppCompatResources" Version="1.3.1.1" />
  <PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.1.0.1" />

diff --git a/Android/SignalRJavaClient/build.cake b/Android/SignalRJavaClient/build.cake
@@ -1,8 +1,8 @@
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var NUGET_VERSION = "6.0.1";
+var NUGET_VERSION = "6.0.2";
 
-var JAR_VERSION = "6.0.1";
+var JAR_VERSION = "6.0.2";
 var JAR_URL = $"https://repo1.maven.org/maven2/com/microsoft/signalr/signalr/{JAR_VERSION}/signalr-{JAR_VERSION}.jar";
 
 Task ("externals")

diff --git a/Android/SignalRJavaClient/cgmanifest.json b/Android/SignalRJavaClient/cgmanifest.json
@@ -6,7 +6,7 @@
  "Maven": {
  "ArtifactId": "signalr",
  "GroupId": "com.microsoft.signalr",
- "Version": "6.0.1",
+ "Version": "6.0.2",
  "NuGetId": "Xamarin.AspNet.SignalR.Java.Client"
  }
  }

diff --git a/Android/SignalRJavaClient/source/SignalR.Java.Client/SignalR.Java.Client.csproj b/Android/SignalRJavaClient/source/SignalR.Java.Client/SignalR.Java.Client.csproj
@@ -22,7 +22,7 @@
  <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
  <PackageTags>signalr java client xamarin android monodroid</PackageTags>
- <PackageVersion>6.0.1</PackageVersion>
+ <PackageVersion>6.0.2</PackageVersion>
  </PropertyGroup>
 
  <ItemGroup>