Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit e8f59b4

Browse files
author
Antonio Seric
committed
Merge branch 'main' into ReactiveX.RxKotlin
# Conflicts: # Android/ReactiveX/License.md # Android/ReactiveX/build.cake # Android/ReactiveX/cgmanifest.json # Android/ReactiveX/source/rxjava2/RxAndroid/RxAndroid.csproj # Android/ReactiveX/source/rxjava2/RxJava/RxJava.csproj # Android/ReactiveX/source/rxjava2/RxKotlin/RxKotlin.csproj # Android/ReactiveX/source/rxjava2/RxKotlin/Transforms/Metadata.xml
2 parents a3cc367 + e5ac2d0 commit e8f59b4

File tree

380 files changed

+23695
-1167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+23695
-1167
lines changed

.ci/build-manifest.cake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#addin nuget:?package=Cake.XCode&version=4.1.0
1+
#addin nuget:?package=Cake.XCode&version=4.2.0
22
#addin nuget:?package=Cake.Yaml&version=3.1.0&loadDependencies=true
33
#addin nuget:?package=Cake.Json&version=4.0.0&loadDependencies=true
44
#addin nuget:?package=Xamarin.Nuget.Validator&version=1.1.1
@@ -122,7 +122,7 @@ if (FORCE_BUILD) {
122122
foreach (var buildGroup in BUILD_GROUPS) {
123123
// If ignore triggers for the platform this is running on, do not add the group even if the trigger is matched
124124
if ((buildGroup.IgnoreTriggersOnLinux && IsRunningOnLinux ()) ||
125-
(buildGroup.IgnoreTriggersOnMac && IsRunningOnMac ()) ||
125+
(buildGroup.IgnoreTriggersOnMac && IsRunningOnMacOs ()) ||
126126
(buildGroup.IgnoreTriggersOnWindows && IsRunningOnWindows ()))
127127
continue;
128128

@@ -202,7 +202,7 @@ if (BUILD_NAMES.Length > 0) {
202202

203203
// Remove the builds that cannot run on this platform
204204
groupsToBuild = groupsToBuild
205-
.Where (bg => (bg.BuildOnWindows && IsRunningOnWindows ()) || (bg.BuildOnMac && IsRunningOnMac ()) || (bg.BuildOnLinux && IsRunningOnLinux ()))
205+
.Where (bg => (bg.BuildOnWindows && IsRunningOnWindows ()) || (bg.BuildOnMac && IsRunningOnMacOs ()) || (bg.BuildOnLinux && IsRunningOnLinux ()))
206206
.ToList ();
207207
if (groupsToBuild.Count > 0) {
208208
Information ("Removed the items that cannot build on this platform, leaving:" + Environment.NewLine +
@@ -223,7 +223,7 @@ if (groupsToBuild.Count == 0) {
223223
// Make a note if nothing changed...
224224
Warning ("No changed files affected any of the paths from the manifest.yaml.");
225225
} else {
226-
if (IsRunningOnMac ()) {
226+
if (IsRunningOnMacOs ()) {
227227
// Make sure cocoapods are up to date if needed
228228
if (podRepoUpdate != PodRepoUpdate.NotRequired) {
229229
if (podRepoUpdate == PodRepoUpdate.Forced)
@@ -268,7 +268,7 @@ if (groupsToBuild.Count == 0) {
268268
targets = BUILD_TARGETS.ToList ();
269269
else if (IsRunningOnWindows ())
270270
targets = buildGroup.WindowsBuildTargets.ToList ();
271-
else if (IsRunningOnMac ())
271+
else if (IsRunningOnMacOs ())
272272
targets = buildGroup.MacBuildTargets.ToList ();
273273
else if (IsRunningOnLinux ())
274274
targets = buildGroup.LinuxBuildTargets.ToList ();
@@ -418,12 +418,12 @@ public class BuildGroup {
418418
public override string ToString () => Name;
419419
}
420420

421-
bool IsRunningOnMac () {
421+
bool IsRunningOnMacOs () {
422422
return System.Environment.OSVersion.Platform == PlatformID.MacOSX || MacPlatformDetector.IsMac.Value;
423423
}
424424

425425
bool IsRunningOnLinux () {
426-
return IsRunningOnUnix () && !IsRunningOnMac ();
426+
return IsRunningOnUnix () && !IsRunningOnMacOs ();
427427
}
428428

429429
internal static class MacPlatformDetector {

.ci/build.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
initSteps: [] # any steps to run before .NET global tools are installed
88
preBuildSteps: [] # any steps that need to run just before the main compilation starts
99
postBuildSteps: [] # any steps that need to run just after the main compilation ends
10-
masterBranchName: 'master' # the "master" branch that should be used - can be something other than "master"
10+
masterBranchName: 'main' # the "master" branch that should be used - can be something other than "master"
1111
installAppleCertificates: 'true' # whether or not to install the Apple certificates and provisioning profiles
1212
submodules: false # whether or not to check out submodules
1313
areaPath: '' # the areaPath to log any issues
@@ -22,12 +22,13 @@ parameters:
2222
windowsImage: 'windows-latest' # the name of the Windows VM image
2323
mono: 'Latest' # the version of mono to use
2424
xcode: '12.3' # the version of Xcode to use
25-
dotnet: '3.1.302' # the version of .NET Core to use
26-
cake: '0.38.4' # the version of Cake to use
25+
dotnet: '5.0.203' # the version of .NET Core to use
26+
dotnetStable: '3.1.408' # the stable version of .NET Core to use
27+
cake: '0.38.5' # the version of Cake to use
2728
apiTools: '1.1.0-preview.1' # the version of the api-tools CLI to use
2829
xharness: '1.0.0-prerelease.20602.1'
2930
tools: [] # a list of any additional .NET Core tools needed
30-
cakeTemplatesBranch: 'master' # the branch of XamarinComponents that has the templates
31+
cakeTemplatesBranch: 'main' # the branch of XamarinComponents that has the templates
3132
# build parameters
3233
buildType: 'basic' # the type of build: 'basic', 'manifest', 'directories', 'none'
3334
steps: [] # the steps to use when building, typically for 'none'
@@ -102,11 +103,19 @@ jobs:
102103
- bash: echo '##vso[task.setvariable variable=PATH;]'$PATH:$HOME/.dotnet/tools
103104
displayName: 'Add ~/.dotnet/tools to the PATH environment variable'
104105
condition: or(eq(variables['System.JobName'], 'macos'), eq(variables['System.JobName'], 'linux'))
106+
- task: UseDotNet@2
107+
displayName: 'Switch to the correct version of the .NET Core SDK'
108+
inputs:
109+
version: ${{ parameters.dotnetStable }}
110+
performMultiLevelLookup: true
111+
includePreviewVersions: true
112+
condition: ne('${{ parameters.dotnetStable }}', '')
105113
- task: UseDotNet@2
106114
displayName: 'Switch to the correct version of the .NET Core SDK'
107115
inputs:
108116
version: ${{ parameters.dotnet }}
109117
performMultiLevelLookup: true
118+
includePreviewVersions: true
110119
condition: ne('${{ parameters.dotnet }}', '')
111120
# custom init steps
112121
- ${{ parameters.initSteps }}
@@ -202,6 +211,7 @@ jobs:
202211
# the basic build
203212
- ${{ if eq(parameters.buildType, 'basic') }}:
204213
- pwsh: |
214+
Get-Content $MyInvocation.MyCommand.Definition
205215
dotnet cake ${{ parameters.cakeFile }} ${{ parameters.cakeExtraArgs }} `
206216
--gitpreviouscommit="$(GitLastSuccessfulCommit)" `
207217
--gitcommit="$(Build.SourceVersion)" `
@@ -224,6 +234,7 @@ jobs:
224234
Invoke-WebRequest -Uri $uri -OutFile "build-directories.cake"
225235
displayName: 'Download the cake script to build directory-based repositories'
226236
- pwsh: |
237+
Get-Content $MyInvocation.MyCommand.Definition
227238
$force = if ("$env:FORCEBUILD") { "$env:FORCEBUILD" } else { "${{ parameters.forceBuild }}" }
228239
$names = if ("$env:BUILDDIRECTORYNAMES") { "$env:BUILDDIRECTORYNAMES" } else { "${{ parameters.namesFilter }}" }
229240
$targets = if ("$env:BUILDDIRECTORYTARGETS") { "$env:BUILDDIRECTORYTARGETS" } else { "${{ parameters.targetsFilter }}" }
@@ -252,6 +263,7 @@ jobs:
252263
Invoke-WebRequest -Uri $uri -OutFile "build-manifest.cake"
253264
displayName: 'Download the cake script to build manifest-based repositories'
254265
- pwsh: |
266+
Get-Content $MyInvocation.MyCommand.Definition
255267
$force = if ("$env:FORCEBUILD") { "$env:FORCEBUILD" } else { "${{ parameters.forceBuild }}" }
256268
$names = if ("$env:BUILDMANIFESTNAMES") { "$env:BUILDMANIFESTNAMES" } else { "${{ parameters.namesFilter }}" }
257269
$targets = if ("$env:BUILDMANIFESTTARGETS") { "$env:BUILDMANIFESTTARGETS" } else { "${{ parameters.targetsFilter }}" }

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ tmpnupkg/
1111
*.user
1212
.DS_Store
1313
*.user
14-
artifacts/
14+
artifacts/
15+
.idea/
16+
*.binlog

Android/ARCore/build.cake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#load "../../common.cake"
1+
//#load "../../common.cake"
22

33
var TARGET = Argument ("t", Argument ("target", "ci"));
44

5-
var NUGET_VERSION = "1.16.0";
5+
var NUGET_VERSION = "1.24.0";
66

7-
var AAR_VERSION = "1.16.0";
7+
var AAR_VERSION = "1.24.0";
88
var AAR_URL = string.Format("https://dl.google.com/dl/android/maven2/com/google/ar/core/{0}/core-{0}.aar", AAR_VERSION);
99
var OBJ_VERSION = "0.3.0";
1010
var OBJ_URL = string.Format("https://oss.sonatype.org/content/repositories/releases/de/javagl/obj/{0}/obj-{0}.jar", OBJ_VERSION);
@@ -69,7 +69,7 @@ Task ("clean")
6969
.Does (() =>
7070
{
7171
if (DirectoryExists ("./externals/"))
72-
DeleteDirectory ("./externals", true);
72+
DeleteDirectory ("./externals", new DeleteDirectorySettings { Force=true });
7373
});
7474

7575
Task("ci")

Android/ARCore/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"Maven": {
77
"ArtifactId": "core",
88
"GroupId": "com.google.ar",
9-
"Version": "1.16.0",
9+
"Version": "1.24.0",
1010
"NuGetId": "Xamarin.Google.ARCore"
1111
}
1212
}

Android/ARCore/samples/HelloAR.sln

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
4-
VisualStudioVersion = 14.0.23107.0
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.31205.134
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloAR", "HelloAR\HelloAR.csproj", "{82C11300-689B-4356-A5B9-64571E6E03FD}"
76
EndProject
@@ -17,6 +16,7 @@ Global
1716
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1817
{82C11300-689B-4356-A5B9-64571E6E03FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1918
{82C11300-689B-4356-A5B9-64571E6E03FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
19+
{82C11300-689B-4356-A5B9-64571E6E03FD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
2020
{82C11300-689B-4356-A5B9-64571E6E03FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
2121
{82C11300-689B-4356-A5B9-64571E6E03FD}.Release|Any CPU.Build.0 = Release|Any CPU
2222
{7B372CCE-4D08-4562-9B71-A36295CD14A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -31,6 +31,9 @@ Global
3131
GlobalSection(SolutionProperties) = preSolution
3232
HideSolutionNode = FALSE
3333
EndGlobalSection
34+
GlobalSection(ExtensibilityGlobals) = postSolution
35+
SolutionGuid = {F0EBAC99-6D53-4916-883F-B33F92D09589}
36+
EndGlobalSection
3437
GlobalSection(MonoDevelopProperties) = preSolution
3538
version = 1.12.0
3639
EndGlobalSection
Lines changed: 1 addition & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1 @@
1-
using System;
2-
using Android.Runtime;
3-
4-
namespace Google.AR.Core
5-
{
6-
public partial class Point
7-
{
8-
static Delegate cb_getAnchors;
9-
#pragma warning disable 0169
10-
static Delegate GetGetAnchorsHandler()
11-
{
12-
if (cb_getAnchors == null)
13-
cb_getAnchors = JNINativeWrapper.CreateDelegate((Func<IntPtr, IntPtr, IntPtr>)n_GetAnchors);
14-
return cb_getAnchors;
15-
}
16-
17-
static IntPtr n_GetAnchors(IntPtr jnienv, IntPtr native__this)
18-
{
19-
global::Google.AR.Core.Point __this = global::Java.Lang.Object.GetObject<global::Google.AR.Core.Point>(jnienv, native__this, JniHandleOwnership.DoNotTransfer);
20-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.ToLocalJniHandle(__this.Anchors);
21-
}
22-
#pragma warning restore 0169
23-
24-
static IntPtr id_getAnchors;
25-
public virtual unsafe global::System.Collections.Generic.ICollection<global::Google.AR.Core.Anchor> Anchors {
26-
// Metadata.xml XPath method reference: path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]"
27-
[Register("getAnchors", "()Ljava/util/Collection;", "GetGetAnchorsHandler")]
28-
get {
29-
if (id_getAnchors == IntPtr.Zero)
30-
id_getAnchors = JNIEnv.GetMethodID(class_ref, "getAnchors", "()Ljava/util/Collection;");
31-
try {
32-
33-
if (((object)this).GetType() == ThresholdType)
34-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.FromJniHandle(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_getAnchors), JniHandleOwnership.TransferLocalRef);
35-
else
36-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "getAnchors", "()Ljava/util/Collection;")), JniHandleOwnership.TransferLocalRef);
37-
} finally {
38-
}
39-
}
40-
}
41-
}
42-
43-
44-
public partial class Plane
45-
{
46-
static Delegate cb_getAnchors;
47-
#pragma warning disable 0169
48-
static Delegate GetGetAnchorsHandler()
49-
{
50-
if (cb_getAnchors == null)
51-
cb_getAnchors = JNINativeWrapper.CreateDelegate((Func<IntPtr, IntPtr, IntPtr>)n_GetAnchors);
52-
return cb_getAnchors;
53-
}
54-
55-
static IntPtr n_GetAnchors(IntPtr jnienv, IntPtr native__this)
56-
{
57-
global::Google.AR.Core.Plane __this = global::Java.Lang.Object.GetObject<global::Google.AR.Core.Plane>(jnienv, native__this, JniHandleOwnership.DoNotTransfer);
58-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.ToLocalJniHandle(__this.Anchors);
59-
}
60-
#pragma warning restore 0169
61-
62-
static IntPtr id_getAnchors;
63-
public virtual unsafe global::System.Collections.Generic.ICollection<global::Google.AR.Core.Anchor> Anchors {
64-
// Metadata.xml XPath method reference: path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]"
65-
[Register("getAnchors", "()Ljava/util/Collection;", "GetGetAnchorsHandler")]
66-
get {
67-
if (id_getAnchors == IntPtr.Zero)
68-
id_getAnchors = JNIEnv.GetMethodID(class_ref, "getAnchors", "()Ljava/util/Collection;");
69-
try {
70-
71-
if (((object)this).GetType() == ThresholdType)
72-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.FromJniHandle(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_getAnchors), JniHandleOwnership.TransferLocalRef);
73-
else
74-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "getAnchors", "()Ljava/util/Collection;")), JniHandleOwnership.TransferLocalRef);
75-
} finally {
76-
}
77-
}
78-
}
79-
}
80-
}
1+


Android/ARCore/source/Google.ARCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
55
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
6-
<ReleaseVersion>1.16.0</ReleaseVersion>
6+
<ReleaseVersion>1.24.0</ReleaseVersion>
77
</PropertyGroup>
88
<PropertyGroup>
99
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

Android/ARCore/source/Transforms/Metadata.xml

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,59 @@
66

77
<attr path="/api/package[@name='com.google.vr.dynamite.client']" name="managedName">Google.VR.Dynamite.Client</attr>
88

9-
<attr path="/api/package[@name='com.google.ar.core']/class[@name='ArImage']" name="extends">Android.Media.Image</attr>
10-
<attr path="/api/package[@name='com.google.vr.dynamite.client']/class[@name='ObjectWrapper']" name="extends">Java.Lang.Object</attr>
9+
<attr path="/api/package[@name='com.google.ar.core']/class[@name='ArImage']" name="extends">Android.Media.Image</attr>
10+
<attr path="/api/package[@name='com.google.vr.dynamite.client']/class[@name='ObjectWrapper']" name="extends">Java.Lang.Object</attr>
1111

12-
<attr path="/api/package[@name='com.google.ar.core']/class[@name='TrackableBase']" name="visibility">public</attr>
12+
<!-- <attr path="/api/package[@name='com.google.ar.core']/class[@name='TrackableBase']" name="visibility">public</attr>-->
1313

14-
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]" />
15-
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]" />
16-
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedImage']/method[@name='getAnchors' and count(parameter)=0]" />
14+
<!-- <attr-->
15+
<!-- path="/api/package[@name='com.google.ar.core.services.downloads.aidl']"-->
16+
<!-- name="managedName"-->
17+
<!-- >-->
18+
<!-- Google.AR.Core.Services.Downloads.AIDL-->
19+
<!-- </attr>-->
20+
<!-- <attr-->
21+
<!-- path="/api/package[@name='com.google.ar.core.services.downloads.client']"-->
22+
<!-- name="managedName"-->
23+
<!-- >-->
24+
<!-- Google.AR.Core.Services.Downloads.Client-->
25+
<!-- </attr>-->
26+
27+
<attr
28+
path="/api/package[@name='com.google.ar.core']/class[@name='InstantPlacementPoint']/method[@name='getAnchors' and count(parameter)=0]"
29+
name="return">
30+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
31+
</attr>
32+
33+
<attr
34+
path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedImage']/method[@name='getAnchors' and count(parameter)=0]"
35+
name="return">
36+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
37+
</attr>
38+
1739

1840
<attr
19-
path="/api/package[@name='com.google.ar.core.services.downloads.aidl']"
20-
name="managedName"
21-
>
22-
Google.AR.Core.Services.Downloads.AIDL
41+
path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]"
42+
name="return">
43+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
2344
</attr>
45+
2446
<attr
25-
path="/api/package[@name='com.google.ar.core.services.downloads.client']"
26-
name="managedName"
27-
>
28-
Google.AR.Core.Services.Downloads.Client
47+
path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]"
48+
name="return">
49+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
2950
</attr>
30-
51+
52+
<attr
53+
path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedFace']/method[@name='getAnchors' and count(parameter)=0]"
54+
name="return"
55+
>
56+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
57+
</attr>
58+
3159
<attr
32-
path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedFace']/method[@name='getAnchors' and count(parameter)=0]"
33-
name="return"
34-
>
60+
path="/api/package[@name='com.google.ar.core']/class[@name='DepthPoint']/method[@name='getAnchors' and count(parameter)=0]"
61+
name="return">
3562
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
3663
</attr>
3764

0 commit comments

Comments
 (0)