diff --git a/README.md b/README.md index ea7575c..a23210f 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ One can pre-install SDK packages with the `sdkmanager`, when passing `_ANDROID_S And one can pre-install Gradle by passing `_GRADLE_VERSION`.
At the moment these are both statically set in [`cloudbuild.yaml`](https://github.com/syslogic/cloudbuild-android/blob/master/cloudbuild.yaml), but the code is there. - - `_CLI_TOOLS_VERSION` ~ `12266719` + - `_CLI_TOOLS_VERSION` ~ `12700392` - `_ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-35 build-tools;35.0.0` - - `_GRADLE_VERSION` ~ `8.10.2` + - `_GRADLE_VERSION` ~ `8.12` ## Usage example: Google Cloud Build @@ -131,7 +131,7 @@ While these substitutions use no underscore (being mapped at build-time: [`.spac - `CLI_TOOLS_VERSION` ~ `12266719` - `ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-35 build-tools;35.0.0` - - `GRADLE_VERSION` ~ `8.10.2` + - `GRADLE_VERSION` ~ `8.12` - `DOCKER_IMAGE` ~ the location of the Docker image previously built. The following example `.space.kts` uses `xxd` (instead of `gcloud kms`) to revert hex-dumps of binary files. diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 0afd446..e00f057 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -23,7 +23,7 @@ steps: # '--build-arg', 'ANDROID_SDK_PACKAGES=platform-tools platforms;android-35 build-tools;35.0.0 ndk;25.1.8937393', '--build-arg', '_ANDROID_SDK_PACKAGES=platform-tools platforms;android-35 build-tools;35.0.0', '--build-arg', '_CLI_TOOLS_VERSION=12700392', - '--build-arg', '_GRADLE_VERSION=8.11.1', + '--build-arg', '_GRADLE_VERSION=8.12', # enable cloudbuild network '--network', 'cloudbuild', diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ae80e6..ce20ab1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,33 +1,33 @@ [versions] -android_gradle_plugin = '8.7.3' -google_mobile_services = '4.4.2' -firebase_appdistribution = '5.0.0' -firebase_crashlytics_plugin = '3.0.2' -firebase_perf_plugin = '1.4.2' +android_gradle_plugin = '8.7.3' +google_mobile_services = '4.4.2' +firebase_appdistribution = '5.0.0' +firebase_crashlytics_plugin = '3.0.2' +firebase_perf_plugin = '1.4.2' -kotlin = '2.0.21' -junit = '4.13.2' -androidx_appcompat = '1.7.0' -androidx_constraintlayout = '2.2.0' -androidx_navigation = '2.8.5' -androidx_test_junit = '1.2.1' -androidx_test_core = '1.6.1' -androidx_test_rules = '1.6.1' -androidx_test_runner = '1.6.2' -androidx_test_monitor = '1.7.2' -androidx_test_espresso = '3.6.1' -androidx_test_uiautomator = '2.3.0' -firebase_crashlytics = '19.3.0' -firebase_perf = '21.0.3' +kotlin = '2.0.21' +junit = '4.13.2' +androidx_appcompat = '1.7.0' +androidx_constraintlayout = '2.2.0' +androidx_navigation = '2.8.5' +androidx_test_junit = '1.2.1' +androidx_test_core = '1.6.1' +androidx_test_rules = '1.6.1' +androidx_test_runner = '1.6.2' +androidx_test_monitor = '1.7.2' +androidx_test_espresso = '3.6.1' +androidx_test_uiautomator = '2.3.0' +firebase_crashlytics = '19.3.0' +firebase_perf = '21.0.3' [plugins] -android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" } -# android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" } -androidx_navigation_safeargs = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" } -google_mobile_services = { id = "com.google.gms.google-services", version.ref = "google_mobile_services" } -firebase_appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebase_appdistribution" } -firebase_crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase_crashlytics_plugin" } -firebase_perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebase_perf_plugin" } +android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" } +# android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" } +androidx_navigation_safeargs = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" } +google_mobile_services = { id = "com.google.gms.google-services", version.ref = "google_mobile_services" } +firebase_appdistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebase_appdistribution" } +firebase_crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase_crashlytics_plugin" } +firebase_perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebase_perf_plugin" } [libraries] androidx_appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx_appcompat" }