diff --git a/build.gradle b/build.gradle index ba875a6a..824ab275 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { ext { - compileSdkVersion = 31 - minSdkVersion = 24 - targetSdkVersion = 31 + compileSdk = 31 + minSdk = 24 + targetSdk = 31 - kotlin_version = '1.6.10' + kotlin_version = '1.6.21' kotlinx_coroutines_version = '1.5.2' - lifecycle_runtime_ktx_version = '2.4.0' + lifecycle_runtime_ktx_version = '2.4.1' fragment_ktx_version = '1.4.1' core_ktx_version = '1.7.0' @@ -19,7 +19,7 @@ buildscript { arcore_version = '1.31.0' fuel_version = '2.3.1' - material_version = '1.5.0' + material_version = '1.6.0' } repositories { google() @@ -27,7 +27,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0' } diff --git a/core/build.gradle b/core/build.gradle index 5e2f0c8d..a643dc67 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,17 +1,17 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' // id 'com.vanniktech.maven.publish' } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk consumerProguardFiles 'lib-proguard-rules.pro' @@ -19,22 +19,22 @@ android { } compileOptions { // Sceneform libraries use language constructs from Java 8. - // Add these compile options if targeting minSdkVersion < 26. + // Add these compile options if targeting minSdk < 26. sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } - aaptOptions { - noCompress 'filamat', 'ktx' - } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + androidResources { + noCompress 'filamat', 'ktx' + } } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 247c51ca..7125175b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip diff --git a/samples/3d-model-viewer/build.gradle b/samples/3d-model-viewer/build.gradle index 9bad07cc..34f110c1 100644 --- a/samples/3d-model-viewer/build.gradle +++ b/samples/3d-model-viewer/build.gradle @@ -1,18 +1,18 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { applicationId "com.google.ar.sceneform.samples.sceneviewbackground" - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 1 versionName "1.0" } diff --git a/samples/ar-model-viewer-java/build.gradle b/samples/ar-model-viewer-java/build.gradle index 69bde351..23a4752c 100644 --- a/samples/ar-model-viewer-java/build.gradle +++ b/samples/ar-model-viewer-java/build.gradle @@ -3,13 +3,14 @@ plugins { } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk defaultConfig { applicationId "com.google.ar.sceneform.samples.gltf" - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 1 versionName "1.0" } diff --git a/samples/ar-model-viewer/build.gradle b/samples/ar-model-viewer/build.gradle index 2bbd28d7..aa04173b 100644 --- a/samples/ar-model-viewer/build.gradle +++ b/samples/ar-model-viewer/build.gradle @@ -4,14 +4,15 @@ plugins { } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk defaultConfig { applicationId "com.google.ar.sceneform.samples.gltf" - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 1 versionName "1.0" } diff --git a/samples/augmented-faces/build.gradle b/samples/augmented-faces/build.gradle index 4e183a84..f37156bc 100644 --- a/samples/augmented-faces/build.gradle +++ b/samples/augmented-faces/build.gradle @@ -3,13 +3,15 @@ plugins { } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { applicationId "com.google.ar.sceneform.samples.augmentedfaces" - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 1 versionName "1.0" } diff --git a/samples/augmented-images/build.gradle b/samples/augmented-images/build.gradle index 3ca30806..c1024e73 100644 --- a/samples/augmented-images/build.gradle +++ b/samples/augmented-images/build.gradle @@ -1,18 +1,18 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { applicationId "com.google.ar.sceneform.samples.augmentedimages" - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 1 versionName "1.0.0" } diff --git a/samples/depth/build.gradle b/samples/depth/build.gradle index 33171d25..48273d02 100644 --- a/samples/depth/build.gradle +++ b/samples/depth/build.gradle @@ -3,13 +3,15 @@ plugins { } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { applicationId 'com.google.ar.sceneform.samples.depth' - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 1 versionName "1.0" } @@ -17,7 +19,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - aaptOptions { + androidResources { noCompress 'filamat', 'ktx' } diff --git a/samples/environment-lights/build.gradle b/samples/environment-lights/build.gradle index 8eb4c9f1..4fc2e8d0 100644 --- a/samples/environment-lights/build.gradle +++ b/samples/environment-lights/build.gradle @@ -1,21 +1,22 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'kotlin-android-extensions' id 'kotlin-kapt' } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + buildFeatures { dataBinding true } defaultConfig { applicationId "com.google.ar.sceneform.samples.environmentlights" - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 2 versionName "1.0.1" } @@ -26,7 +27,7 @@ android { kotlinOptions { jvmTarget = '1.8' } - aaptOptions { + androidResources { noCompress 'filamat', 'ktx' } } diff --git a/samples/environment-lights/src/main/AndroidManifest.xml b/samples/environment-lights/src/main/AndroidManifest.xml index 96e53aed..90330fc9 100644 --- a/samples/environment-lights/src/main/AndroidManifest.xml +++ b/samples/environment-lights/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ - + diff --git a/samples/image-texture/build.gradle b/samples/image-texture/build.gradle index 44298f0b..8c53172f 100644 --- a/samples/image-texture/build.gradle +++ b/samples/image-texture/build.gradle @@ -1,18 +1,18 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { applicationId "com.google.ar.sceneform.samples.imagetexture" - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 1 versionName "1.0" } diff --git a/samples/video-texture/build.gradle b/samples/video-texture/build.gradle index 99771fd5..0d2608ab 100644 --- a/samples/video-texture/build.gradle +++ b/samples/video-texture/build.gradle @@ -1,18 +1,18 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { applicationId "com.google.ar.sceneform.samples.videotexture" - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk versionCode 1 versionName "1.0" } diff --git a/sceneform/build.gradle b/sceneform/build.gradle index fb47a1f5..bbd14bcb 100644 --- a/sceneform/build.gradle +++ b/sceneform/build.gradle @@ -1,36 +1,36 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' // id 'com.vanniktech.maven.publish' } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk } compileOptions { // Sceneform libraries use language constructs from Java 8. - // Add these compile options if targeting minSdkVersion < 26. + // Add these compile options if targeting minSdk < 26. sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } - aaptOptions { - noCompress 'filamat', 'ktx' - } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + androidResources { + noCompress 'filamat', 'ktx' + } } dependencies { diff --git a/ux/build.gradle b/ux/build.gradle index 60e7f6d7..6ba2f05b 100644 --- a/ux/build.gradle +++ b/ux/build.gradle @@ -1,36 +1,36 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' // id 'com.vanniktech.maven.publish' } android { - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdk rootProject.ext.compileSdk + compileSdkVersion rootProject.ext.compileSdk + defaultConfig { - // Sceneform requires minSdkVersion >= 24. - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion + // Sceneform requires minSdk >= 24. + minSdk rootProject.ext.minSdk + targetSdk rootProject.ext.targetSdk } compileOptions { // Sceneform libraries use language constructs from Java 8. - // Add these compile options if targeting minSdkVersion < 26. + // Add these compile options if targeting minSdk < 26. sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } - aaptOptions { - noCompress 'filamat', 'ktx' - } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + androidResources { + noCompress 'filamat', 'ktx' + } } dependencies {