gradle: upgrade Android SDK to API 36 / Baklava

Keep targetSdk and minSdk unchanged. Ensure SDK is up-to-date as Google once again changed relevant CompanionDevice APIs.
This commit is contained in:
Thomas Kuehne
2025-06-03 20:59:49 +02:00
committed by José Rebelo
parent d6fb02619a
commit 3320203c23
5 changed files with 13 additions and 15 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
steps:
build:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- pwd #bump
- ./gradlew assembleDebug --stacktrace
+8 -8
View File
@@ -6,7 +6,7 @@ clone:
steps:
check-if-released:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
environment:
HC_URL_NIGHTLY_DEPLOY:
from_secret: hc_url_nightly_deploy
@@ -27,7 +27,7 @@ steps:
build-apks:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- if [ -f .do_not_build ]; then return 0; fi
# build the apks
@@ -44,7 +44,7 @@ steps:
from_secret: keypass
pull-repo-config:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- if [ -f .do_not_build ]; then return 0; fi
- cd ..
@@ -59,7 +59,7 @@ steps:
from_secret: commit_token
pull-pages:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- if [ -f .do_not_build ]; then return 0; fi
# prepare the pages repo, so fdroidclient can push files into it later
@@ -78,7 +78,7 @@ steps:
#- rm -f fdroid/repo/*apk
update-fdroid-data:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- if [ -f .do_not_build ]; then return 0; fi
- pwd
@@ -104,7 +104,7 @@ steps:
from_secret: keypass
push-pages-update-repo:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- if [ -f .do_not_build ]; then return 0; fi
- cd ../pages/pages/
@@ -127,7 +127,7 @@ steps:
from_secret: commit_token
on-success:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- curl -fsS -m 10 --retry 5 "$${HC_URL_NIGHTLY_DEPLOY}"
when:
@@ -137,7 +137,7 @@ steps:
from_secret: hc_url_nightly_deploy
on-error:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- curl -fsS -m 10 --retry 5 "$${HC_URL_NIGHTLY_DEPLOY}/fail"
- cd ..
+1 -1
View File
@@ -1,6 +1,6 @@
steps:
lint:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- pwd #bump
- ./gradlew lint
+1 -1
View File
@@ -1,6 +1,6 @@
steps:
tests:
image: codeberg.org/freeyourgadget/android-fdroid-tools:35.0.1-androguard-4.1.2-java-21
image: codeberg.org/freeyourgadget/android-fdroid-tools:36.0.0-androguard-4.1.2-java-21
commands:
- pwd #bump
- ./gradlew :app:testBangleDebugUnitTest :app:testMainDebugUnitTest
+2 -4
View File
@@ -86,13 +86,11 @@ android {
// Note: update toolchain.languageVersion when changing targetSdk
//noinspection OldTargetApi
targetSdk = 34
compileSdk = 35
compileSdk = 36
// Note: update sourceCompatibility and targetCompatibility when changing minSdk
minSdk = 21
// WORKAROUND: 35.0.0 is broken if a directory in the AIDL build starts with "u" (https://issuetracker.google.com/issues/389488321)
// however 35 is required by com.android.tools.build:gradle:8.9.1, the latest version supported by Android Studio
buildToolsVersion = '35.0.1'
buildToolsVersion = '36.0.0'
// Note: always bump BOTH versionCode and versionName!
versionName "0.85.0"