Skip to content

Commit 0016aae

Browse files
committed
platforms;android-36.1 build-tools;36.1.0
1 parent 744c713 commit 0016aae

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dockerfile for building with Android SDK/NDK, including Google Cloud SDK.
22
FROM amazoncorretto:17-al2-jdk AS builder
3-
LABEL description="Android Builder" version="1.2.7" repository="https://github.com/syslogic/cloudbuild-android" maintainer="Martin Zeitler"
3+
LABEL description="Android Builder" version="1.2.8" repository="https://github.com/syslogic/cloudbuild-android" maintainer="Martin Zeitler"
44
LABEL org.opencontainers.image.description="Android Builder"
55

66
# Packages
@@ -10,7 +10,7 @@ RUN yum -y install wget unzip xxd libidn && yum -y upgrade
1010

1111
# Arguments, now with default values.
1212
ARG _CLI_TOOLS_VERSION=13114758
13-
ARG _ANDROID_SDK_PACKAGES="platform-tools platforms;android-36 build-tools;36.0.0 emulator"
13+
ARG _ANDROID_SDK_PACKAGES="platform-tools platforms;android-36.1 build-tools;36.1.0 emulator"
1414
ARG _GRADLE_VERSION=9.1.0
1515

1616
# Path

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ And one can pre-install Gradle by passing `_GRADLE_VERSION`.<br/>
3838
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.
3939

4040
- `_CLI_TOOLS_VERSION` ~ `13114758`
41-
- `_ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-36 build-tools;36.0.0 emulator`
41+
- `_ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-36.1 build-tools;36.1.0 emulator`
4242
- `_GRADLE_VERSION` ~ `9.1.0`
4343

4444
## Usage example: Google Cloud Build
@@ -140,7 +140,7 @@ The example app uses [Google Cloud KMS Gradle Plugin](https://github.com/syslogi
140140
These substitutions use no underscore.
141141

142142
- `CLI_TOOLS_VERSION` ~ `13114758`
143-
- `ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-36 build-tools;36.0.0 emulator`
143+
- `ANDROID_SDK_PACKAGES` ~ `platform-tools platforms;android-36.1 build-tools;36.1.0 emulator`
144144
- `GRADLE_VERSION` ~ `9.1.0`
145145
- `DOCKER_IMAGE` ~ the location of the Docker image previously built.
146146

cloudbuild.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ steps:
2020

2121
# By default these static values are being used, without the NDK (build-trigger configuration not required.
2222
# Note: When commenting these out, one has to run `./gradlew build` to fetch the components instead.
23-
# '--build-arg', 'ANDROID_SDK_PACKAGES=platform-tools platforms;android-36 build-tools;36.0.0 emulator ndk;25.1.8937393',
24-
'--build-arg', '_ANDROID_SDK_PACKAGES=platform-tools platforms;android-36 build-tools;36.0.0 emulator',
23+
# '--build-arg', 'ANDROID_SDK_PACKAGES=platform-tools platforms;android-36.1 build-tools;36.1.0 emulator ndk;25.1.8937393',
24+
'--build-arg', '_ANDROID_SDK_PACKAGES=platform-tools platforms;android-36.1 build-tools;36.1.0 emulator',
2525
'--build-arg', '_CLI_TOOLS_VERSION=13114758',
2626
'--build-arg', '_GRADLE_VERSION=9.1.0',
2727

gradle/libs.versions.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
[versions]
2-
android_gradle_plugin = '8.13.0'
3-
google_mobile_services = '4.4.4'
4-
firebase_appdistribution = '5.1.1'
5-
firebase_crashlytics_plugin = '3.0.6'
6-
firebase_perf_plugin = '2.0.1'
2+
android_gradle_plugin = "8.13.1"
3+
google_mobile_services = "4.4.4"
4+
firebase_appdistribution = "5.2.0"
5+
firebase_crashlytics_plugin = "3.0.6"
6+
firebase_perf_plugin = "2.0.2"
77

8-
kotlin = '2.2.21'
9-
junit = '4.13.2'
8+
kotlin = "2.2.21"
9+
junit = "4.13.2"
1010

11-
androidx_appcompat = '1.7.1'
12-
androidx_constraintlayout = '2.2.1'
13-
androidx_navigation = '2.9.5'
14-
androidx_test_junit = '1.3.0'
15-
androidx_test_core = '1.7.0'
16-
androidx_test_rules = '1.7.0'
17-
androidx_test_runner = '1.7.0'
18-
androidx_test_monitor = '1.8.0'
19-
androidx_test_espresso = '3.7.0'
20-
androidx_test_uiautomator = '2.3.0'
11+
androidx_appcompat = "1.7.1"
12+
androidx_constraintlayout = "2.2.1"
13+
androidx_navigation = "2.9.6"
14+
androidx_test_junit = "1.3.0"
15+
androidx_test_core = "1.7.0"
16+
androidx_test_rules = "1.7.0"
17+
androidx_test_runner = "1.7.0"
18+
androidx_test_monitor = "1.8.0"
19+
androidx_test_espresso = "3.7.0"
20+
androidx_test_uiautomator = "2.3.0"
2121

22-
firebase_crashlytics = '20.0.3'
23-
firebase_perf = '22.0.2'
22+
firebase_crashlytics = "20.0.3"
23+
firebase_perf = "22.0.4"
2424

2525
[plugins]
2626
android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }

0 commit comments

Comments
 (0)