version 1.2.6

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.5" repository="https://github.com/syslogic/cloudbuild-android" maintainer="Martin Zeitler"
+LABEL description="Android Builder" version="1.2.6" repository="https://github.com/syslogic/cloudbuild-android" maintainer="Martin Zeitler"
 LABEL org.opencontainers.image.description="Android Builder"
 
 # Packages
@@ -10,7 +10,7 @@ RUN yum -y install wget unzip xxd libidn && yum -y upgrade
 
 # Arguments, now with default values.
 ARG _CLI_TOOLS_VERSION=13114758
-ARG _ANDROID_SDK_PACKAGES="platform-tools platforms;android-36 build-tools;36.0.0"
+ARG _ANDROID_SDK_PACKAGES="platform-tools platforms;android-36 build-tools;36.0.0 emulator"
 ARG _GRADLE_VERSION=9.0.0
 
 # Path

README.md

@@ -1,5 +1,5 @@
 # Android Builder Image
-<img src="https://storage.googleapis.com/cloudbuild-badges/cloudbuild-android-master.svg"/>
+<img src="https://storage.googleapis.com/cloudbuild-badges/cloudbuild-android-master.svg" alt=""/>
 
 ## Docker Image
 
@@ -38,8 +38,8 @@ And one can pre-install Gradle by passing `_GRADLE_VERSION`.<br/>
 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` ~ `13114758`
- - `_ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-35 build-tools;35.0.0`
- - `_GRADLE_VERSION` ~ `8.13`
+ - `_ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-36 build-tools;36.0.0 emulator`
+ - `_GRADLE_VERSION` ~ `9.0.0`
 
 ## Usage example: Google Cloud Build
 
@@ -135,17 +135,15 @@ The example app uses [Google Cloud KMS Gradle Plugin](https://github.com/syslogi
 ````shell
 ./gradlew mobile:cloudKmsDecrypt mobile:assembleRelease mobile:appDistributionUploadRelease
 ````
-## Usage example: JetBrains Space Automation
+## Usage example: Bitbucket Pipeline
 
-The variable substitutions look pretty much the same, being called "Parameters".<br/>
-While these substitutions use no underscore (being mapped at build-time: [`.space.kts`](https://github.com/syslogic/cloudbuild-android/blob/master/.space.kts)).
+These substitutions use no underscore.
 
  - `CLI_TOOLS_VERSION` ~ `13114758`
- - `ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-35 build-tools;35.0.0`
- - `GRADLE_VERSION` ~ `8.13`
+ - `ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-36 build-tools;36.0.0 emulator`
+ - `GRADLE_VERSION` ~ `9.0.0`
  - `DOCKER_IMAGE` ~  the location of the Docker image previously built.
 
-````
 ## GCP Service Account
 
 - for Firebase AppDistribution, the service account needs IAM role "Firebase App Distribution Admin".

cloudbuild.yaml

@@ -20,10 +20,10 @@ steps:
 
     # By default these static values are being used, without the NDK (build-trigger configuration not required.
     # 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 build-tools;36.0.0 ndk;25.1.8937393',
-    '--build-arg', '_ANDROID_SDK_PACKAGES=platform-tools platforms;android-36 build-tools;36.0.0',
+    # '--build-arg', 'ANDROID_SDK_PACKAGES=platform-tools platforms;android-36 build-tools;36.0.0 emulator ndk;25.1.8937393',
+    '--build-arg', '_ANDROID_SDK_PACKAGES=platform-tools platforms;android-36 build-tools;36.0.0 emulator',
     '--build-arg', '_CLI_TOOLS_VERSION=13114758',
-    '--build-arg', '_GRADLE_VERSION=8.14.2',
+    '--build-arg', '_GRADLE_VERSION=9.0.0',
 
     # enable cloudbuild network
     '--network', 'cloudbuild',

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-android_gradle_plugin             = "8.11.1"
+android_gradle_plugin             = "8.12.0"
 google_mobile_services            = '4.4.3'
 firebase_appdistribution          = '5.1.1'
-firebase_crashlytics_plugin       = '3.0.5'
-firebase_perf_plugin              = '2.0.0'
+firebase_crashlytics_plugin       = '3.0.6'
+firebase_perf_plugin              = '2.0.1'
 
 kotlin                            = '2.2.0'
 junit                             = '4.13.2'
@@ -34,7 +34,6 @@ 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" }

mobile/build.gradle

@@ -17,7 +17,7 @@ android {
     buildToolsVersion = "36.0.0"
     defaultConfig {
         applicationId = "io.syslogic.cloudbuild"
-        minSdk = 22
+        minSdk = 23
         compileSdk = 36
         targetSdk = 36
         versionCode = 2