From bf322eb3b27a5d8aeaa4e2c6aa8c24d83272e702 Mon Sep 17 00:00:00 2001 From: Mark Fine Date: Thu, 10 Oct 2024 17:22:07 +0000 Subject: [PATCH] ARCore Android SDK v1.46.0 --- samples/augmented_faces_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/augmented_faces_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/augmented_image_c/app/build.gradle | 13 +++++++------ .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/augmented_image_c/app/src/main/cpp/glm.h | 2 ++ samples/augmented_image_c/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/augmented_image_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/augmented_image_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/cloud_anchor_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/cloud_anchor_java/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/computervision_c/app/build.gradle | 13 +++++++------ .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/computervision_c/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/computervision_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/computervision_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/geospatial_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/geospatial_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/hardwarebuffer_c/app/build.gradle | 13 +++++++------ .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/hardwarebuffer_c/app/src/main/cpp/glm.h | 2 ++ samples/hardwarebuffer_c/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/hardwarebuffer_java/app/build.gradle | 13 +++++++------ .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/hardwarebuffer_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/hello_ar_c/app/build.gradle | 13 +++++++------ .../hello_ar_c/app/src/main/AndroidManifest.xml | 7 +++++++ samples/hello_ar_c/app/src/main/cpp/glm.h | 2 ++ samples/hello_ar_c/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/hello_ar_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/hello_ar_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/hello_ar_kotlin/app/build.gradle | 13 +++++++------ .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/hello_ar_kotlin/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/hello_ar_vulkan_c/app/build.gradle | 13 +++++++------ .../app/src/main/AndroidManifest.xml | 7 +++++++ .../src/main/assets/shaders/background_frag.spv.h | 3 +++ .../src/main/assets/shaders/background_vert.spv.h | 3 +++ samples/hello_ar_vulkan_c/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/hello_eis_kotlin/app/build.gradle | 13 +++++++------ .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/hello_eis_kotlin/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/ml_kotlin/app/build.gradle | 15 ++++++++------- .../ml_kotlin/app/src/main/AndroidManifest.xml | 7 +++++++ samples/ml_kotlin/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../persistent_cloud_anchor_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/persistent_cloud_anchor_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/raw_depth_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/raw_depth_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/recording_playback_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/recording_playback_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/semantics_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/semantics_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/shared_camera_java/app/build.gradle | 11 ++++++----- .../app/src/main/AndroidManifest.xml | 7 +++++++ samples/shared_camera_java/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 85 files changed, 326 insertions(+), 154 deletions(-) diff --git a/samples/augmented_faces_java/app/build.gradle b/samples/augmented_faces_java/app/build.gradle index 5f155610c6..5f1b509c3f 100644 --- a/samples/augmented_faces_java/app/build.gradle +++ b/samples/augmented_faces_java/app/build.gradle @@ -16,20 +16,21 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.augmentedfaces" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.augmentedfaces" // AR Optional apps must declare minSdkVersion >= 14. // AR Required apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -41,7 +42,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/augmented_faces_java/app/src/main/AndroidManifest.xml b/samples/augmented_faces_java/app/src/main/AndroidManifest.xml index 14fd7289e6..049ef8be71 100644 --- a/samples/augmented_faces_java/app/src/main/AndroidManifest.xml +++ b/samples/augmented_faces_java/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.java.augmentedfaces"> + + + + + diff --git a/samples/augmented_faces_java/build.gradle b/samples/augmented_faces_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/augmented_faces_java/build.gradle +++ b/samples/augmented_faces_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/augmented_faces_java/gradle/wrapper/gradle-wrapper.properties b/samples/augmented_faces_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/augmented_faces_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/augmented_faces_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/augmented_image_c/app/build.gradle b/samples/augmented_image_c/app/build.gradle index f5ffb81bfb..b2f2e239ff 100644 --- a/samples/augmented_image_c/app/build.gradle +++ b/samples/augmented_image_c/app/build.gradle @@ -25,14 +25,15 @@ def arcore_libpath = "${buildDir}/arcore-native" configurations { natives } android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.c.augmentedimage" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.c.augmentedimage" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' @@ -50,8 +51,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -68,8 +69,8 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' - natives 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' + natives 'com.google.ar:core:1.46.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.1.0' diff --git a/samples/augmented_image_c/app/src/main/AndroidManifest.xml b/samples/augmented_image_c/app/src/main/AndroidManifest.xml index 1ecf8ccb96..8c709fc8c9 100644 --- a/samples/augmented_image_c/app/src/main/AndroidManifest.xml +++ b/samples/augmented_image_c/app/src/main/AndroidManifest.xml @@ -18,6 +18,13 @@ package="com.google.ar.core.examples.c.augmentedimage"> + + + + + diff --git a/samples/augmented_image_c/app/src/main/cpp/glm.h b/samples/augmented_image_c/app/src/main/cpp/glm.h index 226c78e802..94412a34e9 100644 --- a/samples/augmented_image_c/app/src/main/cpp/glm.h +++ b/samples/augmented_image_c/app/src/main/cpp/glm.h @@ -17,7 +17,9 @@ #define C_ARCORE_AUGMENTED_IMAGE_GLM_H_ #define GLM_FORCE_RADIANS 1 +#ifndef GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL +#endif #include "glm.hpp" #include "gtc/matrix_transform.hpp" #include "gtc/type_ptr.hpp" diff --git a/samples/augmented_image_c/build.gradle b/samples/augmented_image_c/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/augmented_image_c/build.gradle +++ b/samples/augmented_image_c/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/augmented_image_c/gradle/wrapper/gradle-wrapper.properties b/samples/augmented_image_c/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/augmented_image_c/gradle/wrapper/gradle-wrapper.properties +++ b/samples/augmented_image_c/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/augmented_image_java/app/build.gradle b/samples/augmented_image_java/app/build.gradle index 21acb7e1a2..873d569810 100644 --- a/samples/augmented_image_java/app/build.gradle +++ b/samples/augmented_image_java/app/build.gradle @@ -16,20 +16,21 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.augmentedimage" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.augmentedimage" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -41,7 +42,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/augmented_image_java/app/src/main/AndroidManifest.xml b/samples/augmented_image_java/app/src/main/AndroidManifest.xml index 198c013dba..bba5aad676 100644 --- a/samples/augmented_image_java/app/src/main/AndroidManifest.xml +++ b/samples/augmented_image_java/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.java.augmentedimage"> + + + + + diff --git a/samples/augmented_image_java/build.gradle b/samples/augmented_image_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/augmented_image_java/build.gradle +++ b/samples/augmented_image_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/augmented_image_java/gradle/wrapper/gradle-wrapper.properties b/samples/augmented_image_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/augmented_image_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/augmented_image_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/cloud_anchor_java/app/build.gradle b/samples/cloud_anchor_java/app/build.gradle index 7eff627159..d80a1d7f59 100644 --- a/samples/cloud_anchor_java/app/build.gradle +++ b/samples/cloud_anchor_java/app/build.gradle @@ -16,20 +16,21 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.cloudanchor" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.cloudanchor" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -41,7 +42,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/cloud_anchor_java/app/src/main/AndroidManifest.xml b/samples/cloud_anchor_java/app/src/main/AndroidManifest.xml index 19fcf4f339..369e4d6fed 100644 --- a/samples/cloud_anchor_java/app/src/main/AndroidManifest.xml +++ b/samples/cloud_anchor_java/app/src/main/AndroidManifest.xml @@ -23,6 +23,13 @@ + + + + + diff --git a/samples/cloud_anchor_java/build.gradle b/samples/cloud_anchor_java/build.gradle index 0f07b39920..63e8ed2b1f 100644 --- a/samples/cloud_anchor_java/build.gradle +++ b/samples/cloud_anchor_java/build.gradle @@ -21,8 +21,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.android.tools.build:gradle:8.4.0' + classpath 'com.google.gms:google-services:4.3.15' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/cloud_anchor_java/gradle/wrapper/gradle-wrapper.properties b/samples/cloud_anchor_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/cloud_anchor_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/cloud_anchor_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/computervision_c/app/build.gradle b/samples/computervision_c/app/build.gradle index f77f3f369f..3a23983832 100644 --- a/samples/computervision_c/app/build.gradle +++ b/samples/computervision_c/app/build.gradle @@ -25,14 +25,15 @@ def arcore_libpath = "${buildDir}/arcore-native" configurations { natives } android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.c.computervision" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.c.computervision" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' @@ -50,8 +51,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -68,8 +69,8 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' - natives 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' + natives 'com.google.ar:core:1.46.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.1.0' diff --git a/samples/computervision_c/app/src/main/AndroidManifest.xml b/samples/computervision_c/app/src/main/AndroidManifest.xml index 789b43f53c..5ab8eac9ea 100644 --- a/samples/computervision_c/app/src/main/AndroidManifest.xml +++ b/samples/computervision_c/app/src/main/AndroidManifest.xml @@ -18,6 +18,13 @@ package="com.google.ar.core.examples.c.computervision"> + + + + + diff --git a/samples/computervision_c/build.gradle b/samples/computervision_c/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/computervision_c/build.gradle +++ b/samples/computervision_c/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/computervision_c/gradle/wrapper/gradle-wrapper.properties b/samples/computervision_c/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/computervision_c/gradle/wrapper/gradle-wrapper.properties +++ b/samples/computervision_c/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/computervision_java/app/build.gradle b/samples/computervision_java/app/build.gradle index 393f657524..c9f1b55bf7 100644 --- a/samples/computervision_java/app/build.gradle +++ b/samples/computervision_java/app/build.gradle @@ -16,20 +16,21 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.computervision" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.computervision" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -41,7 +42,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/computervision_java/app/src/main/AndroidManifest.xml b/samples/computervision_java/app/src/main/AndroidManifest.xml index 7bd9876006..47a034c593 100644 --- a/samples/computervision_java/app/src/main/AndroidManifest.xml +++ b/samples/computervision_java/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.java.computervision"> + + + + + diff --git a/samples/computervision_java/build.gradle b/samples/computervision_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/computervision_java/build.gradle +++ b/samples/computervision_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/computervision_java/gradle/wrapper/gradle-wrapper.properties b/samples/computervision_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/computervision_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/computervision_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/geospatial_java/app/build.gradle b/samples/geospatial_java/app/build.gradle index 349c68cf5f..d1c143296f 100644 --- a/samples/geospatial_java/app/build.gradle +++ b/samples/geospatial_java/app/build.gradle @@ -16,20 +16,21 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.geospatial" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.geospatial" // AR Optional apps must declare minSdkVersion >= 14. // AR Required apps must declare minSdkVersion >= 24. minSdkVersion 28 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -41,7 +42,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' implementation 'com.google.android.gms:play-services-location:19.0.1' implementation 'com.google.android.gms:play-services-auth:19.0.0' diff --git a/samples/geospatial_java/app/src/main/AndroidManifest.xml b/samples/geospatial_java/app/src/main/AndroidManifest.xml index e52845f8cb..efba8dd877 100644 --- a/samples/geospatial_java/app/src/main/AndroidManifest.xml +++ b/samples/geospatial_java/app/src/main/AndroidManifest.xml @@ -27,6 +27,13 @@ + + + + + diff --git a/samples/geospatial_java/build.gradle b/samples/geospatial_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/geospatial_java/build.gradle +++ b/samples/geospatial_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/geospatial_java/gradle/wrapper/gradle-wrapper.properties b/samples/geospatial_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/geospatial_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/geospatial_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/hardwarebuffer_c/app/build.gradle b/samples/hardwarebuffer_c/app/build.gradle index d06f8d9d3c..eeb462d680 100644 --- a/samples/hardwarebuffer_c/app/build.gradle +++ b/samples/hardwarebuffer_c/app/build.gradle @@ -25,14 +25,15 @@ def arcore_libpath = "${buildDir}/arcore-native" configurations { natives } android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.c.helloarhardwarebuffer" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.c.helloarhardwarebuffer" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 27. minSdkVersion 27 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' @@ -52,8 +53,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -70,8 +71,8 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' - natives 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' + natives 'com.google.ar:core:1.46.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.1.0' diff --git a/samples/hardwarebuffer_c/app/src/main/AndroidManifest.xml b/samples/hardwarebuffer_c/app/src/main/AndroidManifest.xml index fdf187bc5c..9d64a94fab 100644 --- a/samples/hardwarebuffer_c/app/src/main/AndroidManifest.xml +++ b/samples/hardwarebuffer_c/app/src/main/AndroidManifest.xml @@ -18,6 +18,13 @@ package="com.google.ar.core.examples.c.helloarhardwarebuffer"> + + + + + diff --git a/samples/hardwarebuffer_c/app/src/main/cpp/glm.h b/samples/hardwarebuffer_c/app/src/main/cpp/glm.h index fd4a259601..971d30ed20 100644 --- a/samples/hardwarebuffer_c/app/src/main/cpp/glm.h +++ b/samples/hardwarebuffer_c/app/src/main/cpp/glm.h @@ -17,7 +17,9 @@ #define C_ARCORE_HELLOE_AR_GLM_H_ #define GLM_FORCE_RADIANS 1 +#ifndef GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL +#endif #include "glm.hpp" #include "gtc/matrix_transform.hpp" #include "gtc/type_ptr.hpp" diff --git a/samples/hardwarebuffer_c/build.gradle b/samples/hardwarebuffer_c/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/hardwarebuffer_c/build.gradle +++ b/samples/hardwarebuffer_c/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/hardwarebuffer_c/gradle/wrapper/gradle-wrapper.properties b/samples/hardwarebuffer_c/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/hardwarebuffer_c/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hardwarebuffer_c/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/hardwarebuffer_java/app/build.gradle b/samples/hardwarebuffer_java/app/build.gradle index 5296a6051d..ecff0e94f6 100644 --- a/samples/hardwarebuffer_java/app/build.gradle +++ b/samples/hardwarebuffer_java/app/build.gradle @@ -21,14 +21,15 @@ def arcore_libpath = "${buildDir}/arcore-native" configurations { natives } android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.helloarhardwarebuffer" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.helloarhardwarebuffer" // AR Optional apps must declare minSdkVersion >= 14. // AR Required apps must declare minSdkVersion >= 27. minSdkVersion 27 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' @@ -48,8 +49,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -66,8 +67,8 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' - natives 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' + natives 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/hardwarebuffer_java/app/src/main/AndroidManifest.xml b/samples/hardwarebuffer_java/app/src/main/AndroidManifest.xml index 7e1f771226..b5eac70cea 100644 --- a/samples/hardwarebuffer_java/app/src/main/AndroidManifest.xml +++ b/samples/hardwarebuffer_java/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.java.helloarhardwarebuffer"> + + + + + diff --git a/samples/hardwarebuffer_java/build.gradle b/samples/hardwarebuffer_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/hardwarebuffer_java/build.gradle +++ b/samples/hardwarebuffer_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/hardwarebuffer_java/gradle/wrapper/gradle-wrapper.properties b/samples/hardwarebuffer_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/hardwarebuffer_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hardwarebuffer_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/hello_ar_c/app/build.gradle b/samples/hello_ar_c/app/build.gradle index e5711524cb..8e07f2dc1f 100644 --- a/samples/hello_ar_c/app/build.gradle +++ b/samples/hello_ar_c/app/build.gradle @@ -25,14 +25,15 @@ def arcore_libpath = "${buildDir}/arcore-native" configurations { natives } android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.c.helloar" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.c.helloar" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' @@ -50,8 +51,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -68,8 +69,8 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' - natives 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' + natives 'com.google.ar:core:1.46.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.1.0' diff --git a/samples/hello_ar_c/app/src/main/AndroidManifest.xml b/samples/hello_ar_c/app/src/main/AndroidManifest.xml index 8c528e464a..b8981f53be 100644 --- a/samples/hello_ar_c/app/src/main/AndroidManifest.xml +++ b/samples/hello_ar_c/app/src/main/AndroidManifest.xml @@ -18,6 +18,13 @@ package="com.google.ar.core.examples.c.helloar"> + + + + + diff --git a/samples/hello_ar_c/app/src/main/cpp/glm.h b/samples/hello_ar_c/app/src/main/cpp/glm.h index fd4a259601..971d30ed20 100644 --- a/samples/hello_ar_c/app/src/main/cpp/glm.h +++ b/samples/hello_ar_c/app/src/main/cpp/glm.h @@ -17,7 +17,9 @@ #define C_ARCORE_HELLOE_AR_GLM_H_ #define GLM_FORCE_RADIANS 1 +#ifndef GLM_ENABLE_EXPERIMENTAL #define GLM_ENABLE_EXPERIMENTAL +#endif #include "glm.hpp" #include "gtc/matrix_transform.hpp" #include "gtc/type_ptr.hpp" diff --git a/samples/hello_ar_c/build.gradle b/samples/hello_ar_c/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/hello_ar_c/build.gradle +++ b/samples/hello_ar_c/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/hello_ar_c/gradle/wrapper/gradle-wrapper.properties b/samples/hello_ar_c/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/hello_ar_c/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello_ar_c/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/hello_ar_java/app/build.gradle b/samples/hello_ar_java/app/build.gradle index ccd567456d..b27da88fb2 100644 --- a/samples/hello_ar_java/app/build.gradle +++ b/samples/hello_ar_java/app/build.gradle @@ -16,20 +16,21 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.helloar" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.helloar" // AR Optional apps must declare minSdkVersion >= 14. // AR Required apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -41,7 +42,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/hello_ar_java/app/src/main/AndroidManifest.xml b/samples/hello_ar_java/app/src/main/AndroidManifest.xml index e47e298b53..48b3361609 100644 --- a/samples/hello_ar_java/app/src/main/AndroidManifest.xml +++ b/samples/hello_ar_java/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.java.helloar"> + + + + + diff --git a/samples/hello_ar_java/build.gradle b/samples/hello_ar_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/hello_ar_java/build.gradle +++ b/samples/hello_ar_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/hello_ar_java/gradle/wrapper/gradle-wrapper.properties b/samples/hello_ar_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/hello_ar_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello_ar_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/hello_ar_kotlin/app/build.gradle b/samples/hello_ar_kotlin/app/build.gradle index deab2aad14..f47d80539b 100644 --- a/samples/hello_ar_kotlin/app/build.gradle +++ b/samples/hello_ar_kotlin/app/build.gradle @@ -17,20 +17,21 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 33 + namespace "com.google.ar.core.examples.kotlin.helloar" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.kotlin.helloar" // AR Optional apps must declare minSdkVersion >= 14. // AR Required apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 33 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -39,13 +40,13 @@ android { } } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/hello_ar_kotlin/app/src/main/AndroidManifest.xml b/samples/hello_ar_kotlin/app/src/main/AndroidManifest.xml index ca01986afc..068fab0de1 100644 --- a/samples/hello_ar_kotlin/app/src/main/AndroidManifest.xml +++ b/samples/hello_ar_kotlin/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.kotlin.helloar"> + + + + + diff --git a/samples/hello_ar_kotlin/build.gradle b/samples/hello_ar_kotlin/build.gradle index a2e77d06e5..228a434706 100644 --- a/samples/hello_ar_kotlin/build.gradle +++ b/samples/hello_ar_kotlin/build.gradle @@ -16,13 +16,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:8.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/samples/hello_ar_kotlin/gradle/wrapper/gradle-wrapper.properties b/samples/hello_ar_kotlin/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/hello_ar_kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello_ar_kotlin/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/hello_ar_vulkan_c/app/build.gradle b/samples/hello_ar_vulkan_c/app/build.gradle index 5bc4a20ff2..34f3237f32 100644 --- a/samples/hello_ar_vulkan_c/app/build.gradle +++ b/samples/hello_ar_vulkan_c/app/build.gradle @@ -25,14 +25,15 @@ def arcore_libpath = "${buildDir}/arcore-native" configurations { natives } android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.c.simplevulkan" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.c.simplevulkan" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 28. minSdkVersion 28 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' @@ -50,8 +51,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -69,8 +70,8 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' - natives 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' + natives 'com.google.ar:core:1.46.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.1.0' diff --git a/samples/hello_ar_vulkan_c/app/src/main/AndroidManifest.xml b/samples/hello_ar_vulkan_c/app/src/main/AndroidManifest.xml index 5b2a3bde6d..5d1ebccfe2 100644 --- a/samples/hello_ar_vulkan_c/app/src/main/AndroidManifest.xml +++ b/samples/hello_ar_vulkan_c/app/src/main/AndroidManifest.xml @@ -18,6 +18,13 @@ package="com.google.ar.core.examples.c.simplevulkan"> + + + + + diff --git a/samples/hello_ar_vulkan_c/app/src/main/assets/shaders/background_frag.spv.h b/samples/hello_ar_vulkan_c/app/src/main/assets/shaders/background_frag.spv.h index 166cc1283c..54322a981e 100644 --- a/samples/hello_ar_vulkan_c/app/src/main/assets/shaders/background_frag.spv.h +++ b/samples/hello_ar_vulkan_c/app/src/main/assets/shaders/background_frag.spv.h @@ -18,6 +18,9 @@ // 1011.0.0 #pragma once + +#include + const uint32_t background_frag[] = { 0x07230203, 0x00010000, 0x0008000a, 0x00000014, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, diff --git a/samples/hello_ar_vulkan_c/app/src/main/assets/shaders/background_vert.spv.h b/samples/hello_ar_vulkan_c/app/src/main/assets/shaders/background_vert.spv.h index a12efd1d12..646b15ce15 100644 --- a/samples/hello_ar_vulkan_c/app/src/main/assets/shaders/background_vert.spv.h +++ b/samples/hello_ar_vulkan_c/app/src/main/assets/shaders/background_vert.spv.h @@ -18,6 +18,9 @@ // 1011.0.0 #pragma once + +#include + const uint32_t background_vert[] = { 0x07230203, 0x00010000, 0x0008000a, 0x0000001f, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, 0x6474732e, 0x3035342e, diff --git a/samples/hello_ar_vulkan_c/build.gradle b/samples/hello_ar_vulkan_c/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/hello_ar_vulkan_c/build.gradle +++ b/samples/hello_ar_vulkan_c/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/hello_ar_vulkan_c/gradle/wrapper/gradle-wrapper.properties b/samples/hello_ar_vulkan_c/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/hello_ar_vulkan_c/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello_ar_vulkan_c/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/hello_eis_kotlin/app/build.gradle b/samples/hello_eis_kotlin/app/build.gradle index 09e0c49858..b60b66eb53 100644 --- a/samples/hello_eis_kotlin/app/build.gradle +++ b/samples/hello_eis_kotlin/app/build.gradle @@ -17,20 +17,21 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 33 + namespace "com.google.ar.core.examples.kotlin.helloeis" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.kotlin.helloeis" // AR Optional apps must declare minSdkVersion >= 14. // AR Required apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 33 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -39,13 +40,13 @@ android { } } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/hello_eis_kotlin/app/src/main/AndroidManifest.xml b/samples/hello_eis_kotlin/app/src/main/AndroidManifest.xml index ab4c218cfe..3f32066549 100644 --- a/samples/hello_eis_kotlin/app/src/main/AndroidManifest.xml +++ b/samples/hello_eis_kotlin/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.kotlin.helloeis"> + + + + + diff --git a/samples/hello_eis_kotlin/build.gradle b/samples/hello_eis_kotlin/build.gradle index a2e77d06e5..228a434706 100644 --- a/samples/hello_eis_kotlin/build.gradle +++ b/samples/hello_eis_kotlin/build.gradle @@ -16,13 +16,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:8.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/samples/hello_eis_kotlin/gradle/wrapper/gradle-wrapper.properties b/samples/hello_eis_kotlin/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/hello_eis_kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello_eis_kotlin/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/ml_kotlin/app/build.gradle b/samples/ml_kotlin/app/build.gradle index c2aa524288..180e7bae73 100644 --- a/samples/ml_kotlin/app/build.gradle +++ b/samples/ml_kotlin/app/build.gradle @@ -19,12 +19,13 @@ plugins { } android { - compileSdkVersion 33 + namespace "com.google.ar.core.examples.kotlin.ml" + compileSdkVersion 35 defaultConfig { - applicationId "com.google.ar.core.examples.java.ml" + applicationId "com.google.ar.core.examples.kotlin.ml" minSdkVersion 24 - targetSdkVersion 33 + targetSdkVersion 35 versionCode 1 versionName '1.0' } @@ -36,11 +37,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } packagingOptions { exclude 'META-INF/DEPENDENCIES' @@ -69,7 +70,7 @@ dependencies { implementation 'com.google.mlkit:object-detection-custom:16.3.1' // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/ml_kotlin/app/src/main/AndroidManifest.xml b/samples/ml_kotlin/app/src/main/AndroidManifest.xml index 720420d0f6..dfe58ebb7e 100644 --- a/samples/ml_kotlin/app/src/main/AndroidManifest.xml +++ b/samples/ml_kotlin/app/src/main/AndroidManifest.xml @@ -21,6 +21,13 @@ + + + + + diff --git a/samples/ml_kotlin/build.gradle b/samples/ml_kotlin/build.gradle index a2e77d06e5..228a434706 100644 --- a/samples/ml_kotlin/build.gradle +++ b/samples/ml_kotlin/build.gradle @@ -16,13 +16,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:8.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/samples/ml_kotlin/gradle/wrapper/gradle-wrapper.properties b/samples/ml_kotlin/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/ml_kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/ml_kotlin/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/persistent_cloud_anchor_java/app/build.gradle b/samples/persistent_cloud_anchor_java/app/build.gradle index d228b32d67..e687e224b1 100644 --- a/samples/persistent_cloud_anchor_java/app/build.gradle +++ b/samples/persistent_cloud_anchor_java/app/build.gradle @@ -16,20 +16,21 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.persistentcloudanchor" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.persistentcloudanchor" // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -45,7 +46,7 @@ repositories { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/persistent_cloud_anchor_java/app/src/main/AndroidManifest.xml b/samples/persistent_cloud_anchor_java/app/src/main/AndroidManifest.xml index 3c91349889..5eafd086a0 100644 --- a/samples/persistent_cloud_anchor_java/app/src/main/AndroidManifest.xml +++ b/samples/persistent_cloud_anchor_java/app/src/main/AndroidManifest.xml @@ -23,6 +23,13 @@ + + + + + diff --git a/samples/persistent_cloud_anchor_java/build.gradle b/samples/persistent_cloud_anchor_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/persistent_cloud_anchor_java/build.gradle +++ b/samples/persistent_cloud_anchor_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/persistent_cloud_anchor_java/gradle/wrapper/gradle-wrapper.properties b/samples/persistent_cloud_anchor_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/persistent_cloud_anchor_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/persistent_cloud_anchor_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/raw_depth_java/app/build.gradle b/samples/raw_depth_java/app/build.gradle index 962cc3020e..e0476727a0 100644 --- a/samples/raw_depth_java/app/build.gradle +++ b/samples/raw_depth_java/app/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.rawdepth" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.rawdepth" @@ -24,13 +25,13 @@ android { // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -42,7 +43,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/raw_depth_java/app/src/main/AndroidManifest.xml b/samples/raw_depth_java/app/src/main/AndroidManifest.xml index 4adfb57c52..f75350ad5e 100644 --- a/samples/raw_depth_java/app/src/main/AndroidManifest.xml +++ b/samples/raw_depth_java/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.java.rawdepth"> + + + + + + + + + diff --git a/samples/recording_playback_java/build.gradle b/samples/recording_playback_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/recording_playback_java/build.gradle +++ b/samples/recording_playback_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/recording_playback_java/gradle/wrapper/gradle-wrapper.properties b/samples/recording_playback_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/recording_playback_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/recording_playback_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/semantics_java/app/build.gradle b/samples/semantics_java/app/build.gradle index 602bfbb3d1..b48cd74408 100644 --- a/samples/semantics_java/app/build.gradle +++ b/samples/semantics_java/app/build.gradle @@ -16,20 +16,21 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.hellosemantics" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.hellosemantics" // AR Optional apps must declare minSdkVersion >= 14. // AR Required apps must declare minSdkVersion >= 24. minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -41,7 +42,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/semantics_java/app/src/main/AndroidManifest.xml b/samples/semantics_java/app/src/main/AndroidManifest.xml index 983a7c1ed9..783b5a03f7 100644 --- a/samples/semantics_java/app/src/main/AndroidManifest.xml +++ b/samples/semantics_java/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.java.hellosemantics"> + + + + + diff --git a/samples/semantics_java/build.gradle b/samples/semantics_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/semantics_java/build.gradle +++ b/samples/semantics_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/semantics_java/gradle/wrapper/gradle-wrapper.properties b/samples/semantics_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/semantics_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/semantics_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/samples/shared_camera_java/app/build.gradle b/samples/shared_camera_java/app/build.gradle index 7564a133e4..7d735b7ab2 100644 --- a/samples/shared_camera_java/app/build.gradle +++ b/samples/shared_camera_java/app/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 34 + namespace "com.google.ar.core.examples.java.sharedcamera" + compileSdkVersion 35 defaultConfig { applicationId "com.google.ar.core.examples.java.sharedcamera" @@ -24,13 +25,13 @@ android { // "AR Optional" apps must declare minSdkVersion >= 14. // "AR Required" apps must declare minSdkVersion >= 24. minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 1 versionName '1.0' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } buildTypes { release { @@ -42,7 +43,7 @@ android { dependencies { // ARCore (Google Play Services for AR) library. - implementation 'com.google.ar:core:1.45.0' + implementation 'com.google.ar:core:1.46.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/shared_camera_java/app/src/main/AndroidManifest.xml b/samples/shared_camera_java/app/src/main/AndroidManifest.xml index e63541407d..b88f9fba3a 100644 --- a/samples/shared_camera_java/app/src/main/AndroidManifest.xml +++ b/samples/shared_camera_java/app/src/main/AndroidManifest.xml @@ -19,6 +19,13 @@ package="com.google.ar.core.examples.java.sharedcamera"> + + + + + diff --git a/samples/shared_camera_java/build.gradle b/samples/shared_camera_java/build.gradle index 19941c85a7..6c9d7c09c6 100644 --- a/samples/shared_camera_java/build.gradle +++ b/samples/shared_camera_java/build.gradle @@ -21,7 +21,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:8.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/samples/shared_camera_java/gradle/wrapper/gradle-wrapper.properties b/samples/shared_camera_java/gradle/wrapper/gradle-wrapper.properties index a8366035c1..16da4ae610 100644 --- a/samples/shared_camera_java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/shared_camera_java/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip