Gradle 9.3, AGP 9.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.0
 
 # 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.0`
  - `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

@@ -23,7 +23,7 @@ steps:
     # '--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', '_GRADLE_VERSION=9.3.0',
 
     # 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,11 +1,11 @@
 [versions]
-android_gradle_plugin             = "8.13.1"
+android_gradle_plugin             = "9.0.0"
 google_mobile_services            = "4.4.4"
 firebase_appdistribution          = "5.2.0"
 firebase_crashlytics_plugin       = "3.0.6"
 firebase_perf_plugin              = "2.0.2"
 
-kotlin                            = "2.2.21"
+kotlin                            = "2.3.0"
 junit                             = "4.13.2"
 
 androidx_appcompat                = "1.7.1"
@@ -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]

mobile/build.gradle

@@ -14,7 +14,7 @@ if (new File(getRootDir().absolutePath + "/buildSrc").exists() || project.plugin
 
 android {
     namespace = "io.syslogic.cloudbuild"
-    buildToolsVersion = "36.0.0"
+    buildToolsVersion = "36.1.0"
     defaultConfig {
         applicationId = "io.syslogic.cloudbuild"
         minSdk = 23