Skip to content

Migrate Android library to AGP 9.0 with version catalog #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AYastrebov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate Android library to AGP 9.0 with version catalog #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/mobile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: '8.6'
gradle-version: '9.5.0'

- name: Set NDK path
run: echo "ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME" >> "$GITHUB_ENV"
Expand Down
10 changes: 3 additions & 7 deletions android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
id("com.android.library") version "8.3.2"
id("org.jetbrains.kotlin.android") version "1.9.22"
alias(libs.plugins.android.library)
// kotlin-android removed: AGP 9.0 has built-in Kotlin support
}

android {
namespace = "com.shoesproxy"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 21
Expand All @@ -23,10 +23,6 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
}

sourceSets {
getByName("main") {
// JNI .so files built by cargo-ndk / build-android.sh
Expand Down
2 changes: 0 additions & 2 deletions android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
android.useAndroidX=true
android.enableJetifier=false
kotlin.code.style=official
org.gradle.caching=true
org.gradle.parallel=true
5 changes: 5 additions & 0 deletions android/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[versions]
agp = "9.0.1"

[plugins]
android-library = { id = "com.android.library", version.ref = "agp" }
Loading