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

Commit d4d9d7c

Browse files
keijikeiji
authored
Merge branch 'master' into fix_1112
2 parents 4b2ee90 + 150d271 commit d4d9d7c

File tree

23 files changed

+93
-69
lines changed

23 files changed

+93
-69
lines changed

‎.ci/build.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ jobs:
202202
# the basic build
203203
- ${{ if eq(parameters.buildType, 'basic') }}:
204204
- pwsh: |
205+
Get-Content $MyInvocation.MyCommand.Definition
205206
dotnet cake ${{ parameters.cakeFile }} ${{ parameters.cakeExtraArgs }} `
206207
--gitpreviouscommit="$(GitLastSuccessfulCommit)" `
207208
--gitcommit="$(Build.SourceVersion)" `
@@ -224,6 +225,7 @@ jobs:
224225
Invoke-WebRequest -Uri $uri -OutFile "build-directories.cake"
225226
displayName: 'Download the cake script to build directory-based repositories'
226227
- pwsh: |
228+
Get-Content $MyInvocation.MyCommand.Definition
227229
$force = if ("$env:FORCEBUILD") { "$env:FORCEBUILD" } else { "${{ parameters.forceBuild }}" }
228230
$names = if ("$env:BUILDDIRECTORYNAMES") { "$env:BUILDDIRECTORYNAMES" } else { "${{ parameters.namesFilter }}" }
229231
$targets = if ("$env:BUILDDIRECTORYTARGETS") { "$env:BUILDDIRECTORYTARGETS" } else { "${{ parameters.targetsFilter }}" }
@@ -252,6 +254,7 @@ jobs:
252254
Invoke-WebRequest -Uri $uri -OutFile "build-manifest.cake"
253255
displayName: 'Download the cake script to build manifest-based repositories'
254256
- pwsh: |
257+
Get-Content $MyInvocation.MyCommand.Definition
255258
$force = if ("$env:FORCEBUILD") { "$env:FORCEBUILD" } else { "${{ parameters.forceBuild }}" }
256259
$names = if ("$env:BUILDMANIFESTNAMES") { "$env:BUILDMANIFESTNAMES" } else { "${{ parameters.namesFilter }}" }
257260
$targets = if ("$env:BUILDMANIFESTTARGETS") { "$env:BUILDMANIFESTTARGETS" } else { "${{ parameters.targetsFilter }}" }

‎.gitignore‎

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

‎Android/ARCore/build.cake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

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

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

7-
var AAR_VERSION = "1.16.0";
7+
var AAR_VERSION = "1.23.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/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

‎Android/ARCore/source/Transforms/Metadata.xml‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,34 @@
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

1212
<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]" />
14+
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]" />
1515
<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]" />
16+
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedImage']/method[@name='getAnchors' and count(parameter)=0]" />
17+
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='InstantPlacementPoint']/method[@name='getAnchors' and count(parameter)=0]" />
1718

18-
<attr
19-
path="/api/package[@name='com.google.ar.core.services.downloads.aidl']"
20-
name="managedName"
21-
>
22-
Google.AR.Core.Services.Downloads.AIDL
23-
</attr>
24-
<attr
25-
path="/api/package[@name='com.google.ar.core.services.downloads.client']"
26-
name="managedName"
27-
>
28-
Google.AR.Core.Services.Downloads.Client
29-
</attr>
19+
<attr
20+
path="/api/package[@name='com.google.ar.core.services.downloads.aidl']"
21+
name="managedName"
22+
>
23+
Google.AR.Core.Services.Downloads.AIDL
24+
</attr>
25+
<attr
26+
path="/api/package[@name='com.google.ar.core.services.downloads.client']"
27+
name="managedName"
28+
>
29+
Google.AR.Core.Services.Downloads.Client
30+
</attr>
3031

31-
<attr
32-
path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedFace']/method[@name='getAnchors' and count(parameter)=0]"
33-
name="return"
34-
>
35-
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
36-
</attr>
32+
<attr
33+
path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedFace']/method[@name='getAnchors' and count(parameter)=0]"
34+
name="return"
35+
>
36+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
37+
</attr>
3738

3839
</metadata>

‎Android/AndroidThings/build.cake‎

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

3-
var TARGET = Argument ("t", Argument ("target", "Default"));
3+
var TARGET = Argument ("t", Argument ("target", "ci"));
44

55
var NUGET_VERSION = "1.0.0.1";
66

77
var JAR_VERSION = "1.0";
8-
var JAR_URL = string.Format ("https://bintray.com/google/androidthings/download_file?file_path=com%2Fgoogle%2Fandroid%2Fthings%2Fandroidthings%2F{0}%2Fandroidthings-{0}.jar", JAR_VERSION);
9-
var DOCS_URL = string.Format ("https://bintray.com/google/androidthings/download_file?file_path=com%2Fgoogle%2Fandroid%2Fthings%2Fandroidthings%2F{0}%2Fandroidthings-{0}-javadoc.jar", JAR_VERSION);
8+
var JAR_URL = $"https://bintray.com/google/androidthings/download_file?file_path=com%2Fgoogle%2Fandroid%2Fthings%2Fandroidthings%2F{JAR_VERSION}%2Fandroidthings-{JAR_VERSION}.jar";
9+
var DOCS_URL = $"https://bintray.com/google/androidthings/download_file?file_path=com%2Fgoogle%2Fandroid%2Fthings%2Fandroidthings%2F{JAR_VERSION}%2Fandroidthings-{JAR_VERSION}-javadoc.jar";
1010

1111
var CONTRIB_URL = "https://bintray.com/google/androidthings/download_file?file_path=com%2Fgoogle%2Fandroid%2Fthings%2Fcontrib%2Fdriver-{0}%2F{1}%2Fdriver-{0}-{1}.aar";
1212
var CONTRIB_SRC_URL = "https://bintray.com/google/androidthings/download_file?file_path=com%2Fgoogle%2Fandroid%2Fthings%2Fcontrib%2Fdriver-{0}%2F{1}%2Fdriver-{0}-{1}-sources.jar";
@@ -69,7 +69,10 @@ Task("nuget")
6969
});
7070

7171
Task("samples");
72+
.IsDependentOn("nuget");
7273
Task("component");
74+
Task("ci");
75+
.IsDependentOn("samples");
7376

7477
Task ("externals")
7578
.Does (() =>

‎Android/AnimatedCircleLoadingView/build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var TARGET = Argument ("t", Argument ("target", "Default"));
55

66
var AAR_VERSION = "1.1.5";
7-
var AAR_URL = string.Format ("https://bintray.com/artifact/download/jlmd/maven/com/github/jlmd/AnimatedCircleLoadingView/{0}/AnimatedCircleLoadingView-{0}.aar", AAR_VERSION);
7+
var AAR_URL = $"https://bintray.com/artifact/download/jlmd/maven/com/github/jlmd/AnimatedCircleLoadingView/{AAR_VERSION}/AnimatedCircleLoadingView-{AAR_VERSION}.aar";
88
var AAR_DEST = "./externals/AnimatedCircleLoadingView.aar";
99

1010
var buildSpec = new BuildSpec () {

‎Android/BetterPickers/build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var TARGET = Argument ("t", Argument ("target", "Default"));
55

66
var LIB_VERSION = "1.6.0";
7-
var AAR_URL = string.Format ("http://search.maven.org/remotecontent?filepath=com/doomonafireball/betterpickers/library/{0}/library-{0}.aar", LIB_VERSION);
7+
var AAR_URL = $"http://search.maven.org/remotecontent?filepath=com/doomonafireball/betterpickers/library/{LIB_VERSION}/library-{LIB_VERSION}.aar";
88

99
var ASB_LIB_VERSION = "1.4.0";
1010
var ASB_AAR_URL = string.Format ("https://bintray.com/artifact/download/bod/JRAF/org/jraf/android-switch-backport/{0}/android-switch-backport-{0}.aar", ASB_LIB_VERSION);

‎Android/FirebaseJobDispatcher/build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var TARGET = Argument ("t", Argument ("target", "Default"));
55

66
var ANDROID_VERSION = "0.8.5";
77
var ANDROID_NUGET_VERSION = "0.8.5";
8-
var ANDROID_URL = string.Format ("https://jcenter.bintray.com/com/firebase/firebase-jobdispatcher/{0}/firebase-jobdispatcher-{0}.aar", ANDROID_VERSION);
8+
var ANDROID_URL = $"https://jcenter.bintray.com/com/firebase/firebase-jobdispatcher/{ANDROID_VERSION}/firebase-jobdispatcher-{ANDROID_VERSION}.aar";
99
var ANDROID_FILE = "firebase-dispatcher.aar";
1010

1111
var buildSpec = new BuildSpec () {

‎Android/RecyclerViewAnimators/build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var TARGET = Argument ("t", Argument ("target", "Default"));
55

66
var JAR_VERSION = "2.1.0";
7-
var JAR_URL = string.Format ("https://bintray.com/artifact/download/wasabeef/maven/jp/wasabeef/recyclerview-animators/{0}/recyclerview-animators-{0}.aar", JAR_VERSION);
7+
var JAR_URL = $"https://repo1.maven.org/maven2/jp/wasabeef/recyclerview-animators/{JAR_VERSION}/recyclerview-animators-{JAR_VERSION}.aar";
88
var JAR_DEST = "./externals/RecyclerViewAnimators.aar";
99

1010
var buildSpec = new BuildSpec () {

0 commit comments

Comments
 (0)