-
Notifications
You must be signed in to change notification settings - Fork 692
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/coil-1.4.0
- Loading branch information
Showing
29 changed files
with
224 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<com.google.ar.core.Anchor> | ||
| </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<com.google.ar.core.Anchor> | ||
| </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<com.google.ar.core.Anchor> | ||
| </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<com.google.ar.core.Anchor> | ||
| </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<com.google.ar.core.Anchor> | ||
| </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<com.google.ar.core.Anchor> | ||
| </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<com.google.ar.core.Anchor> | ||
| </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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
Android/Guava/source/Xamarin.CheckerFramework.CheckerCompatQual/Transforms/Transforms.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <metadata> | ||
| <remove-node path="/api/package" /> | ||
| </metadata> |
37 changes: 37 additions & 0 deletions
37
...arin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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->'%(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> |
6 changes: 6 additions & 0 deletions
6
...rin.CheckerFramework.CheckerCompatQual/Xamarin.CheckerFramework.CheckerCompatQual.targets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> |
4 changes: 4 additions & 0 deletions
4
Android/Guava/source/Xamarin.Google.J2Objc.Annotations/Transforms/Transforms.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <metadata> | ||
| <remove-node path="/api/package" /> | ||
| </metadata> |
Oops, something went wrong.