Skip to content

Commit 31e579f

Browse files
committed
Update codelab for Google IO 2021
1 parent ba2d0e9 commit 31e579f

File tree

58 files changed

+5030
-1712
lines changed

Some content is hidden

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

58 files changed

+5030
-1712
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARCore Cloud Anchors Codelab
22
=============================
33
Copyright (c) 2018 Google Inc. All rights reserved.
44

5-
These are sample Android Studio projects indended for use with the Google AR Codelabs.
5+
These are sample Android Studio projects intended for use with the Google AR Codelabs.
66

77
Please note, we do not accept pull requests.
88

build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.3.0'
10-
classpath 'com.google.ar.sceneform:plugin:1.8.0'
11-
classpath 'com.google.gms:google-services:4.2.0'
9+
classpath 'com.android.tools.build:gradle:4.1.2'
10+
classpath 'com.google.gms:google-services:4.3.5'
1211
// NOTE: Do not place your application dependencies here; they belong
1312
// in the individual module build.gradle files
1413
}

gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
# The setting is particularly useful for tweaking memory settings.
1212
org.gradle.jvmargs=-Xmx1536m
1313

14+
android.enableJetifier=true
15+
android.useAndroidX=true
16+
1417
# When configured, Gradle will run in incubating parallel mode.
1518
# This option should only be used with decoupled projects. More details, visit
1619
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip

helpers/build.gradle

+9-19
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 29
55
defaultConfig {
66
minSdkVersion 26
7-
targetSdkVersion 28
7+
targetSdkVersion 29
88
versionCode 1
99
versionName "1.0"
1010
}
@@ -22,24 +22,14 @@ android {
2222

2323
dependencies {
2424
// ARCore Library
25-
implementation 'com.google.ar:core:1.8.0'
25+
implementation 'com.google.ar:core:1.23.0'
2626

2727
// Android Support Library
28-
implementation 'com.android.support:appcompat-v7:28.0.0'
29-
implementation 'com.android.support:design:28.0.0'
30-
implementation 'com.google.firebase:firebase-database:16.1.0'
31-
}
28+
implementation 'androidx.appcompat:appcompat:1.2.0'
29+
implementation 'com.google.android.material:material:1.3.0'
30+
implementation 'com.google.firebase:firebase-database:19.6.0'
3231

33-
task compileUxAssets {
32+
// Obj - a simple Wavefront OBJ file loader
33+
// https://github.com/javagl/Obj
34+
implementation 'de.javagl:obj:0.2.1'
3435
}
35-
36-
preBuild.dependsOn compileUxAssets
37-
38-
apply plugin: 'com.google.ar.sceneform.plugin'
39-
40-
sceneform.asset('models/andy.obj',
41-
'default',
42-
'models/andy.sfa',
43-
'src/main/res/raw/andy')
44-
45-
sceneform.before('compileUxAssets')

helpers/models/andy.mtl

-7
This file was deleted.

helpers/models/andy.png

-183 KB
Binary file not shown.

helpers/models/andy.sfa

-61
This file was deleted.

0 commit comments

Comments
 (0)