diff --git a/audio-echo/build.gradle b/audio-echo/build.gradle index 224ec7b53..878a35cfb 100644 --- a/audio-echo/build.gradle +++ b/audio-echo/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/audio-echo/gradle.properties b/audio-echo/gradle.properties index acf164f6c..7894b6b33 100644 --- a/audio-echo/gradle.properties +++ b/audio-echo/gradle.properties @@ -16,5 +16,8 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true diff --git a/audio-echo/gradle/wrapper/gradle-wrapper.properties b/audio-echo/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/audio-echo/gradle/wrapper/gradle-wrapper.properties +++ b/audio-echo/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/bitmap-plasma/build.gradle b/bitmap-plasma/build.gradle index 224ec7b53..878a35cfb 100644 --- a/bitmap-plasma/build.gradle +++ b/bitmap-plasma/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/bitmap-plasma/gradle.properties b/bitmap-plasma/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/bitmap-plasma/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties b/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties +++ b/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/camera/build.gradle b/camera/build.gradle index 224ec7b53..878a35cfb 100644 --- a/camera/build.gradle +++ b/camera/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/camera/gradle.properties b/camera/gradle.properties index 5465fec0e..e3dfef4e0 100644 --- a/camera/gradle.properties +++ b/camera/gradle.properties @@ -1,2 +1,5 @@ +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file diff --git a/camera/gradle/wrapper/gradle-wrapper.properties b/camera/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/camera/gradle/wrapper/gradle-wrapper.properties +++ b/camera/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/display-p3/build.gradle b/display-p3/build.gradle index 224ec7b53..878a35cfb 100644 --- a/display-p3/build.gradle +++ b/display-p3/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/display-p3/gradle.properties b/display-p3/gradle.properties index 7bef3c232..87cac57e5 100644 --- a/display-p3/gradle.properties +++ b/display-p3/gradle.properties @@ -9,7 +9,10 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m diff --git a/display-p3/gradle/wrapper/gradle-wrapper.properties b/display-p3/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/display-p3/gradle/wrapper/gradle-wrapper.properties +++ b/display-p3/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/endless-tunnel/build.gradle b/endless-tunnel/build.gradle index 224ec7b53..878a35cfb 100644 --- a/endless-tunnel/build.gradle +++ b/endless-tunnel/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/endless-tunnel/gradle.properties b/endless-tunnel/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/endless-tunnel/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/endless-tunnel/gradle/wrapper/gradle-wrapper.properties b/endless-tunnel/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/endless-tunnel/gradle/wrapper/gradle-wrapper.properties +++ b/endless-tunnel/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/exceptions/build.gradle b/exceptions/build.gradle index 253697423..6b64603cf 100644 --- a/exceptions/build.gradle +++ b/exceptions/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false } \ No newline at end of file diff --git a/exceptions/gradle.properties b/exceptions/gradle.properties index 3c5031eb7..a2e90d87b 100644 --- a/exceptions/gradle.properties +++ b/exceptions/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/exceptions/gradle/wrapper/gradle-wrapper.properties b/exceptions/gradle/wrapper/gradle-wrapper.properties index c3308a913..9bbcb7b29 100644 --- a/exceptions/gradle/wrapper/gradle-wrapper.properties +++ b/exceptions/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Dec 12 11:32:35 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/gles3jni/build.gradle b/gles3jni/build.gradle index 224ec7b53..878a35cfb 100644 --- a/gles3jni/build.gradle +++ b/gles3jni/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/gles3jni/gradle.properties b/gles3jni/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/gles3jni/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/gles3jni/gradle/wrapper/gradle-wrapper.properties b/gles3jni/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/gles3jni/gradle/wrapper/gradle-wrapper.properties +++ b/gles3jni/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-gl2/build.gradle b/hello-gl2/build.gradle index 224ec7b53..878a35cfb 100644 --- a/hello-gl2/build.gradle +++ b/hello-gl2/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/hello-gl2/gradle.properties b/hello-gl2/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/hello-gl2/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/hello-gl2/gradle/wrapper/gradle-wrapper.properties b/hello-gl2/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/hello-gl2/gradle/wrapper/gradle-wrapper.properties +++ b/hello-gl2/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-jni/build.gradle b/hello-jni/build.gradle index 224ec7b53..878a35cfb 100644 --- a/hello-jni/build.gradle +++ b/hello-jni/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/hello-jni/gradle.properties b/hello-jni/gradle.properties index e78e65c08..b3e90e828 100644 --- a/hello-jni/gradle.properties +++ b/hello-jni/gradle.properties @@ -16,3 +16,6 @@ org.gradle.jvmargs=-Xmx1536m # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true android.useAndroidX=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/hello-jni/gradle/wrapper/gradle-wrapper.properties b/hello-jni/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/hello-jni/gradle/wrapper/gradle-wrapper.properties +++ b/hello-jni/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-jniCallback/build.gradle b/hello-jniCallback/build.gradle index 224ec7b53..878a35cfb 100644 --- a/hello-jniCallback/build.gradle +++ b/hello-jniCallback/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/hello-jniCallback/gradle.properties b/hello-jniCallback/gradle.properties index 9e6fce102..f6720ae0b 100644 --- a/hello-jniCallback/gradle.properties +++ b/hello-jniCallback/gradle.properties @@ -9,7 +9,10 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m diff --git a/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties b/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties +++ b/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-libs/build.gradle b/hello-libs/build.gradle index 224ec7b53..878a35cfb 100644 --- a/hello-libs/build.gradle +++ b/hello-libs/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/hello-libs/gradle.properties b/hello-libs/gradle.properties index 915f0e66f..10c8f5e7b 100644 --- a/hello-libs/gradle.properties +++ b/hello-libs/gradle.properties @@ -16,5 +16,8 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file diff --git a/hello-libs/gradle/wrapper/gradle-wrapper.properties b/hello-libs/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/hello-libs/gradle/wrapper/gradle-wrapper.properties +++ b/hello-libs/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-neon/build.gradle b/hello-neon/build.gradle index 224ec7b53..878a35cfb 100644 --- a/hello-neon/build.gradle +++ b/hello-neon/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/hello-neon/gradle.properties b/hello-neon/gradle.properties index 9e6fce102..f6720ae0b 100644 --- a/hello-neon/gradle.properties +++ b/hello-neon/gradle.properties @@ -9,7 +9,10 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m diff --git a/hello-neon/gradle/wrapper/gradle-wrapper.properties b/hello-neon/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/hello-neon/gradle/wrapper/gradle-wrapper.properties +++ b/hello-neon/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-oboe/build.gradle b/hello-oboe/build.gradle index 224ec7b53..878a35cfb 100644 --- a/hello-oboe/build.gradle +++ b/hello-oboe/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/hello-oboe/gradle.properties b/hello-oboe/gradle.properties index aac1f4c11..a9a9ef1bb 100644 --- a/hello-oboe/gradle.properties +++ b/hello-oboe/gradle.properties @@ -25,3 +25,6 @@ android.enableParallelJsonGen=false # use the latest prefab from https://github.com/google/prefab/releases android.prefabVersion=1.0.0 +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/hello-oboe/gradle/wrapper/gradle-wrapper.properties b/hello-oboe/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/hello-oboe/gradle/wrapper/gradle-wrapper.properties +++ b/hello-oboe/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-vulkan/app/build.gradle b/hello-vulkan/app/build.gradle index 346788896..f1c0511ca 100644 --- a/hello-vulkan/app/build.gradle +++ b/hello-vulkan/app/build.gradle @@ -49,6 +49,7 @@ android { } buildFeatures { prefab true + shaders true } namespace 'com.android.hellovk' diff --git a/hello-vulkan/build.gradle b/hello-vulkan/build.gradle index e2a9a0849..4a01a15c5 100644 --- a/hello-vulkan/build.gradle +++ b/hello-vulkan/build.gradle @@ -26,7 +26,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/hello-vulkan/gradle/wrapper/gradle-wrapper.properties b/hello-vulkan/gradle/wrapper/gradle-wrapper.properties index da1db5f04..17655d0ef 100644 --- a/hello-vulkan/gradle/wrapper/gradle-wrapper.properties +++ b/hello-vulkan/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-activity/build.gradle b/native-activity/build.gradle index efc342718..878a35cfb 100644 --- a/native-activity/build.gradle +++ b/native-activity/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/native-activity/gradle.properties b/native-activity/gradle.properties index 7bef3c232..87cac57e5 100644 --- a/native-activity/gradle.properties +++ b/native-activity/gradle.properties @@ -9,7 +9,10 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m diff --git a/native-activity/gradle/wrapper/gradle-wrapper.properties b/native-activity/gradle/wrapper/gradle-wrapper.properties index 2ec77e51a..510e4efae 100644 --- a/native-activity/gradle/wrapper/gradle-wrapper.properties +++ b/native-activity/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-audio/build.gradle b/native-audio/build.gradle index 224ec7b53..878a35cfb 100644 --- a/native-audio/build.gradle +++ b/native-audio/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/native-audio/gradle.properties b/native-audio/gradle.properties index 5465fec0e..e3dfef4e0 100644 --- a/native-audio/gradle.properties +++ b/native-audio/gradle.properties @@ -1,2 +1,5 @@ +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file diff --git a/native-audio/gradle/wrapper/gradle-wrapper.properties b/native-audio/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/native-audio/gradle/wrapper/gradle-wrapper.properties +++ b/native-audio/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-codec/build.gradle b/native-codec/build.gradle index 224ec7b53..878a35cfb 100644 --- a/native-codec/build.gradle +++ b/native-codec/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/native-codec/gradle.properties b/native-codec/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/native-codec/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/native-codec/gradle/wrapper/gradle-wrapper.properties b/native-codec/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/native-codec/gradle/wrapper/gradle-wrapper.properties +++ b/native-codec/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-media/build.gradle b/native-media/build.gradle index 224ec7b53..878a35cfb 100644 --- a/native-media/build.gradle +++ b/native-media/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/native-media/gradle.properties b/native-media/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/native-media/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/native-media/gradle/wrapper/gradle-wrapper.properties b/native-media/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/native-media/gradle/wrapper/gradle-wrapper.properties +++ b/native-media/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-midi/build.gradle b/native-midi/build.gradle index 224ec7b53..878a35cfb 100644 --- a/native-midi/build.gradle +++ b/native-midi/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/native-midi/gradle.properties b/native-midi/gradle.properties index 199d16ede..46309a32d 100644 --- a/native-midi/gradle.properties +++ b/native-midi/gradle.properties @@ -17,4 +17,7 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/native-midi/gradle/wrapper/gradle-wrapper.properties b/native-midi/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/native-midi/gradle/wrapper/gradle-wrapper.properties +++ b/native-midi/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-plasma/build.gradle b/native-plasma/build.gradle index 224ec7b53..878a35cfb 100644 --- a/native-plasma/build.gradle +++ b/native-plasma/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/native-plasma/gradle.properties b/native-plasma/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/native-plasma/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/native-plasma/gradle/wrapper/gradle-wrapper.properties b/native-plasma/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/native-plasma/gradle/wrapper/gradle-wrapper.properties +++ b/native-plasma/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/nn-samples/build.gradle b/nn-samples/build.gradle index 224ec7b53..878a35cfb 100644 --- a/nn-samples/build.gradle +++ b/nn-samples/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/nn-samples/gradle.properties b/nn-samples/gradle.properties index aac7c9b46..8450cacc3 100644 --- a/nn-samples/gradle.properties +++ b/nn-samples/gradle.properties @@ -9,6 +9,9 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/nn-samples/gradle/wrapper/gradle-wrapper.properties b/nn-samples/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/nn-samples/gradle/wrapper/gradle-wrapper.properties +++ b/nn-samples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/orderfile/build.gradle b/orderfile/build.gradle index 1c4b10809..c45cd941d 100644 --- a/orderfile/build.gradle +++ b/orderfile/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.4.0' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21' // NOTE: Do not place your application dependencies here; they belong diff --git a/orderfile/gradle/wrapper/gradle-wrapper.properties b/orderfile/gradle/wrapper/gradle-wrapper.properties index da1db5f04..17655d0ef 100644 --- a/orderfile/gradle/wrapper/gradle-wrapper.properties +++ b/orderfile/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/prefab/curl-ssl/build.gradle b/prefab/curl-ssl/build.gradle index c3278e6b2..501d31157 100644 --- a/prefab/curl-ssl/build.gradle +++ b/prefab/curl-ssl/build.gradle @@ -16,8 +16,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/prefab/curl-ssl/gradle.properties b/prefab/curl-ssl/gradle.properties index d8fe27be0..3987fdd69 100644 --- a/prefab/curl-ssl/gradle.properties +++ b/prefab/curl-ssl/gradle.properties @@ -19,4 +19,7 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties b/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties +++ b/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/prefab/prefab-dependency/build.gradle b/prefab/prefab-dependency/build.gradle index 7daca2243..600606707 100644 --- a/prefab/prefab-dependency/build.gradle +++ b/prefab/prefab-dependency/build.gradle @@ -16,8 +16,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/prefab/prefab-dependency/gradle.properties b/prefab/prefab-dependency/gradle.properties index e435cd21f..5933f1d3e 100644 --- a/prefab/prefab-dependency/gradle.properties +++ b/prefab/prefab-dependency/gradle.properties @@ -28,3 +28,6 @@ android.prefabVersion=1.0.+ # non-Gradle thread when enableParallelJsonGen is enabled. # https://issuetracker.google.com/149575364 android.enableParallelJsonGen=false +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties b/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties +++ b/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/prefab/prefab-publishing/build.gradle b/prefab/prefab-publishing/build.gradle index 7daca2243..600606707 100644 --- a/prefab/prefab-publishing/build.gradle +++ b/prefab/prefab-publishing/build.gradle @@ -16,8 +16,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.jar b/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.jar index f6b961fd5..41d9927a4 100644 Binary files a/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.jar and b/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.jar differ diff --git a/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties b/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties index b1159fc54..17655d0ef 100644 --- a/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties +++ b/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/prefab/prefab-publishing/gradlew b/prefab/prefab-publishing/gradlew index cccdd3d51..1b6c78733 100755 --- a/prefab/prefab-publishing/gradlew +++ b/prefab/prefab-publishing/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/prefab/prefab-publishing/gradlew.bat b/prefab/prefab-publishing/gradlew.bat index f9553162f..107acd32c 100644 --- a/prefab/prefab-publishing/gradlew.bat +++ b/prefab/prefab-publishing/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/prefab/prefab-publishing/mylibrary/build.gradle b/prefab/prefab-publishing/mylibrary/build.gradle index 1be56ba2c..ae8974861 100644 --- a/prefab/prefab-publishing/mylibrary/build.gradle +++ b/prefab/prefab-publishing/mylibrary/build.gradle @@ -21,6 +21,7 @@ plugins { android { compileSdk 33 ndkVersion '25.1.8937393' + namespace "com.example.prefabpublishing" defaultConfig { minSdkVersion 16 diff --git a/san-angeles/build.gradle b/san-angeles/build.gradle index 224ec7b53..878a35cfb 100644 --- a/san-angeles/build.gradle +++ b/san-angeles/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/san-angeles/gradle.properties b/san-angeles/gradle.properties index 6f93f4f48..2d6c5240c 100644 --- a/san-angeles/gradle.properties +++ b/san-angeles/gradle.properties @@ -1 +1,4 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false org.gradle.jvmargs=-Xmx1536m -XX:MaxMetaspaceSize=512m diff --git a/san-angeles/gradle/wrapper/gradle-wrapper.properties b/san-angeles/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/san-angeles/gradle/wrapper/gradle-wrapper.properties +++ b/san-angeles/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sanitizers/build.gradle b/sanitizers/build.gradle index 765d0a25b..9e8c6a2c4 100644 --- a/sanitizers/build.gradle +++ b/sanitizers/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.2.1' apply false - id 'com.android.library' version '8.2.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false } diff --git a/sanitizers/gradle/wrapper/gradle-wrapper.properties b/sanitizers/gradle/wrapper/gradle-wrapper.properties index 0eecdbea8..6c8700f52 100644 --- a/sanitizers/gradle/wrapper/gradle-wrapper.properties +++ b/sanitizers/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Jan 17 09:59:11 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/sensor-graph/build.gradle b/sensor-graph/build.gradle index 224ec7b53..878a35cfb 100644 --- a/sensor-graph/build.gradle +++ b/sensor-graph/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/sensor-graph/gradle.properties b/sensor-graph/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/sensor-graph/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/sensor-graph/gradle/wrapper/gradle-wrapper.properties b/sensor-graph/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/sensor-graph/gradle/wrapper/gradle-wrapper.properties +++ b/sensor-graph/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/teapots/build.gradle b/teapots/build.gradle index 224ec7b53..878a35cfb 100755 --- a/teapots/build.gradle +++ b/teapots/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/teapots/gradle.properties b/teapots/gradle.properties index d56e9d568..796b543a3 100644 --- a/teapots/gradle.properties +++ b/teapots/gradle.properties @@ -14,5 +14,8 @@ # limitations under the License. # # +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true diff --git a/teapots/gradle/wrapper/gradle-wrapper.properties b/teapots/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/teapots/gradle/wrapper/gradle-wrapper.properties +++ b/teapots/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/unit-test/build.gradle b/unit-test/build.gradle index efff7ba2e..389f91910 100644 --- a/unit-test/build.gradle +++ b/unit-test/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } \ No newline at end of file diff --git a/unit-test/gradle.properties b/unit-test/gradle.properties index 3c5031eb7..a2e90d87b 100644 --- a/unit-test/gradle.properties +++ b/unit-test/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/unit-test/gradle/wrapper/gradle-wrapper.properties b/unit-test/gradle/wrapper/gradle-wrapper.properties index 7ba00bfa1..b824e9394 100644 --- a/unit-test/gradle/wrapper/gradle-wrapper.properties +++ b/unit-test/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Dec 07 13:34:13 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/webp/build.gradle b/webp/build.gradle index 224ec7b53..878a35cfb 100644 --- a/webp/build.gradle +++ b/webp/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '8.4.0' apply false + id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } diff --git a/webp/gradle.properties b/webp/gradle.properties new file mode 100644 index 000000000..f82049aad --- /dev/null +++ b/webp/gradle.properties @@ -0,0 +1,3 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false \ No newline at end of file diff --git a/webp/gradle/wrapper/gradle-wrapper.properties b/webp/gradle/wrapper/gradle-wrapper.properties index b1159fc54..510e4efae 100644 --- a/webp/gradle/wrapper/gradle-wrapper.properties +++ b/webp/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists