Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@ jobs:
- name: Make gradlew executable
run: chmod +x ./gradlew

# compileSdk 37 (Android 16) is new enough that the runner image may not preinstall its
# platform. Accept licenses and install it explicitly so the build does not depend on which
# SDK packages happen to be baked into ubuntu-latest. Build-tools are left to AGP's auto-
# download (licenses are accepted above), matching what it resolves locally.
- name: Install Android SDK platform 37
run: |
sdkmanager="${ANDROID_SDK_ROOT:-$ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager"
yes | "$sdkmanager" --licenses >/dev/null 2>&1 || true
"$sdkmanager" "platforms;android-37.0"

- name: ktlint, Android Lint, unit tests, debug assembly
run: ./gradlew ktlintCheck lint test assembleDebug --stacktrace
# Release signing, APK/SHA256SUMS publishing, F-Droid metadata and release-please live in
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ jobs:
- name: Make gradlew executable
run: chmod +x ./gradlew

# compileSdk 37 (Android 16) may not be preinstalled on the runner image; install it
# explicitly so the release build does not depend on the baked-in SDK packages.
- name: Install Android SDK platform 37
run: |
sdkmanager="${ANDROID_SDK_ROOT:-$ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager"
yes | "$sdkmanager" --licenses >/dev/null 2>&1 || true
"$sdkmanager" "platforms;android-37.0"

- name: Decode signing keystore
env:
SIGNING_KEY_BASE64: ${{ secrets.SIGNING_KEY_BASE64 }}
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ val appVersionCode =

android {
namespace = "org.searchmob"
compileSdk = 36
compileSdk = 37

defaultConfig {
applicationId = "org.searchmob"
Expand Down
9 changes: 9 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,12 @@ org.gradle.configuration-cache=true
android.useAndroidX=true
android.nonTransitiveRClass=true
kotlin.code.style=official

# AGP 9 ships built-in Kotlin support and a new DSL on by default, which is incompatible with the
# standalone `org.jetbrains.kotlin.android` plugin this project applies (alongside the matching
# Compose and serialization compiler plugins pinned to our Kotlin version). Opt out for now so the
# existing, working Kotlin toolchain keeps driving compilation on AGP 9; adopting built-in Kotlin
# (and aligning the Compose/serialization plugin versions to AGP's bundled Kotlin) is a follow-up
# that must land before AGP 10 removes this opt-out.
android.builtInKotlin=false
android.newDsl=false
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
agp = "8.13.2"
agp = "9.2.1"
kotlin = "2.4.0"
coreKtx = "1.18.0"
coreKtx = "1.19.0"
activityCompose = "1.13.0"
lifecycleRuntimeKtx = "2.10.0"
composeBom = "2024.12.01"
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=6f74b601422d6d6fc4e1f9a1ab6522f642c2fdcbc15ae33ebd30ba3d7198e854
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down