Gradle 9.3.1, AGP 9.1.0

Author: syslogic

Dockerfile

@@ -1,6 +1,6 @@
 # Dockerfile for building with Android SDK/NDK, including Google Cloud SDK.
 FROM amazoncorretto:17-al2-jdk AS builder
-LABEL description="Android Builder" version="1.2.8" repository="https://github.com/syslogic/cloudbuild-android" maintainer="Martin Zeitler"
+LABEL description="Android Builder" version="1.2.9" repository="https://github.com/syslogic/cloudbuild-android" maintainer="Martin Zeitler"
 LABEL org.opencontainers.image.description="Android Builder"
 
 # Packages
@@ -9,9 +9,9 @@ RUN yum -y install wget unzip xxd libidn && yum -y upgrade
 # RUN yum -y install deltarpm google-cloud-sdk wget unzip xxd libidn && yum -y upgrade
 
 # Arguments, now with default values.
-ARG _CLI_TOOLS_VERSION=13114758
+ARG _CLI_TOOLS_VERSION=14742923
 ARG _ANDROID_SDK_PACKAGES="platform-tools platforms;android-36.1 build-tools;36.1.0 emulator"
-ARG _GRADLE_VERSION=9.2.1
+ARG _GRADLE_VERSION=9.3.1
 
 # Path
 ENV ANDROID_HOME=/opt/android-sdk

README.md

@@ -139,9 +139,9 @@ The example app uses [Google Cloud KMS Gradle Plugin](https://github.com/syslogi
 
 These substitutions use no underscore.
 
- - `CLI_TOOLS_VERSION` ~ `13114758`
+ - `CLI_TOOLS_VERSION` ~ `14742923`
  - `ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-36.1 build-tools;36.1.0 emulator`
- - `GRADLE_VERSION` ~ `9.2.1`
+ - `GRADLE_VERSION` ~ `9.3.1`
  - `DOCKER_IMAGE` ~  the location of the Docker image previously built.
 
 ## GCP Service Account

build.gradle

@@ -41,7 +41,7 @@ allprojects {
             def requested = details.requested
             if (requested.group == 'org.jetbrains.kotlin') {
                 List<String> list = ['kotlin-stdlib', 'kotlin-stdlib-jdk7', 'kotlin-stdlib-jdk8', 'kotlin-stdlib-common']
-                if (list.contains(requested.name)) { details.useVersion libs.versions.kotlin.get() }
+                if (list.contains(requested.name)) { details.useVersion libs.versions.getKotlin().get() }
             }
         }
     }

cloudbuild.yaml

@@ -22,8 +22,8 @@ steps:
     # Note: When commenting these out, one has to run `./gradlew build` to fetch the components instead.
     # '--build-arg', 'ANDROID_SDK_PACKAGES=platform-tools platforms;android-36.1 build-tools;36.1.0  emulator ndk;25.1.8937393',
     '--build-arg', '_ANDROID_SDK_PACKAGES=platform-tools platforms;android-36.1 build-tools;36.1.0  emulator',
-    '--build-arg', '_CLI_TOOLS_VERSION=13114758',
-    '--build-arg', '_GRADLE_VERSION=9.2.1',
+    '--build-arg', '_CLI_TOOLS_VERSION=14742923',
+    '--build-arg', '_GRADLE_VERSION=9.3.1',
 
     # enable cloudbuild network
     '--network', 'cloudbuild',

gradle.properties

@@ -8,4 +8,3 @@ org.gradle.workers.max=6
 
 android.useAndroidX=true
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-android_gradle_plugin             = "8.13.1"
+#noinspection UnusedVersionCatalogEntry
+kotlin                            = "2.3.10"
+junit                             = "4.13.2"
+android_gradle_plugin             = "9.1.0"
 google_mobile_services            = "4.4.4"
-firebase_appdistribution          = "5.2.0"
+firebase_appdistribution          = "5.2.1"
 firebase_crashlytics_plugin       = "3.0.6"
 firebase_perf_plugin              = "2.0.2"
 
-kotlin                            = "2.2.21"
-junit                             = "4.13.2"
-
 androidx_appcompat                = "1.7.1"
 androidx_constraintlayout         = "2.2.1"
-androidx_navigation               = "2.9.6"
+androidx_navigation               = "2.9.7"
 androidx_test_junit               = "1.3.0"
 androidx_test_core                = "1.7.0"
 androidx_test_rules               = "1.7.0"
@@ -19,7 +19,7 @@ androidx_test_monitor             = "1.8.0"
 androidx_test_espresso            = "3.7.0"
 androidx_test_uiautomator         = "2.3.0"
 
-firebase_crashlytics              = "20.0.3"
+firebase_crashlytics              = "20.0.4"
 firebase_perf                     = "22.0.4"
 
 [plugins]
@@ -36,6 +36,7 @@ androidx_appcompat                = { module = "androidx.appcompat:appcompat", v
 androidx_constraintlayout         = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx_constraintlayout" }
 androidx_navigation_fragment      = { module = "androidx.navigation:navigation-fragment", version.ref = "androidx_navigation" }
 androidx_navigation_ui            = { module = "androidx.navigation:navigation-ui", version.ref = "androidx_navigation" }
+
 firebase_crashlytics              = { module = "com.google.firebase:firebase-crashlytics", version.ref = "firebase_crashlytics" }
 # firebase_crashlytics_ndk        = { module = "com.google.firebase:firebase-crashlytics-ndk", version.ref = "firebase_crashlytics" }
 firebase_perf                     = { module = "com.google.firebase:firebase-perf", version.ref = "firebase_perf" }
@@ -47,8 +48,15 @@ androidx_test_core                = { module = "androidx.test:core", version.ref
 androidx_test_rules               = { module = "androidx.test:rules", version.ref = "androidx_test_rules" }
 androidx_test_runner              = { module = "androidx.test:runner", version.ref = "androidx_test_runner" }
 androidx_test_uiautomator         = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx_test_uiautomator" }
+
 androidx_test_espresso_core       = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
 androidx_test_espresso_web        = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }
 androidx_test_espresso_contrib    = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx_test_espresso" }
 androidx_test_espresso_intents    = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidx_test_espresso" }
 androidx_test_espresso_idling_res = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "androidx_test_espresso" }
+
+[bundles]
+androidx_libs                     = [ "androidx_appcompat", "androidx_constraintlayout", "androidx_navigation_fragment", "androidx_navigation_ui" ]
+androidx_test_libs                = [ "androidx_test_junit", "androidx_test_core", "androidx_test_rules", "androidx_test_runner", "androidx_test_uiautomator" ]
+androidx_test_espresso            = [ "androidx_test_espresso_core", "androidx_test_espresso_web", "androidx_test_espresso_contrib", "androidx_test_espresso_intents", "androidx_test_espresso_idling_res" ]
+firebase_libs                     = [ "firebase_crashlytics", "firebase_perf" ]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mobile/build.gradle

@@ -14,7 +14,6 @@ if (new File(getRootDir().absolutePath + "/buildSrc").exists() || project.plugin
 
 android {
     namespace = "io.syslogic.cloudbuild"
-    buildToolsVersion = "36.0.0"
     defaultConfig {
         applicationId = "io.syslogic.cloudbuild"
         minSdk = 23
@@ -27,8 +26,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {
@@ -88,44 +87,18 @@ android {
 }
 
 base {
-    archivesName = 'cloudbuild_' + android.defaultConfig.versionName
+    archivesName = 'demo_' + android.defaultConfig.versionName
 }
 
 dependencies {
-    implementation libs.androidx.appcompat
-    implementation libs.androidx.constraintlayout
-    implementation libs.androidx.navigation.fragment
-    implementation libs.androidx.navigation.ui
-
-    implementation libs.firebase.crashlytics
-    // implementation libs.firebase.crashlytics.ndk
-    implementation libs.firebase.perf
-
-    // jUnit
-    testImplementation libs.junit
+    implementation(libs.bundles.androidx.libs)
+    implementation(libs.bundles.firebase.libs)
 
+    testImplementation(libs.junit)
     // Required for connected tests.
-    // https://mvnrepository.com/artifact/androidx.test/monitor
-    debugImplementation libs.androidx.test.monitor
-
-    // https://mvnrepository.com/artifact/androidx.test.ext
-    androidTestImplementation libs.androidx.test.junit
-
-    // https://mvnrepository.com/artifact/androidx.test
-    // https://developer.android.com/jetpack/androidx/releases/test
-    androidTestImplementation libs.androidx.test.core
-    androidTestImplementation libs.androidx.test.rules
-    androidTestImplementation libs.androidx.test.runner
-
-    // https://mvnrepository.com/artifact/androidx.test.espresso
-    androidTestImplementation libs.androidx.test.espresso.core
-    androidTestImplementation libs.androidx.test.espresso.idling.res
-    androidTestImplementation libs.androidx.test.espresso.contrib
-    androidTestImplementation libs.androidx.test.espresso.intents
-    androidTestImplementation libs.androidx.test.espresso.web
-
-    // https://mvnrepository.com/artifact/androidx.test.uiautomator/uiautomator
-    androidTestImplementation libs.androidx.test.uiautomator
+    debugImplementation(libs.androidx.test.monitor)
+    androidTestImplementation(libs.bundles.androidx.test.libs)
+    androidTestImplementation(libs.bundles.androidx.test.espresso)
 }
 
 /** Google Play Services */

settings.gradle

@@ -5,9 +5,14 @@ pluginManagement {
         maven { url = uri("https://jitpack.io") }
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
 }
 
+plugins {
+    id "org.gradle.toolchains.foojay-resolver-convention" version "1.0.0"
+}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {