diff --git a/app/build.gradle b/app/build.gradle index 159c126..228d38f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,13 @@ plugins { id "kotlin-android" id "kotlin-parcelize" id "com.google.devtools.ksp" + id "org.jetbrains.kotlin.plugin.compose" id "com.github.triplet.play" } android { namespace "io.nekohasekai.sfa" - compileSdk 35 + compileSdk 36 ndkVersion "28.0.13004108" @@ -85,6 +86,7 @@ android { buildFeatures { viewBinding true aidl true + compose true } applicationVariants.configureEach { variant -> @@ -103,10 +105,10 @@ dependencies { implementation "androidx.appcompat:appcompat:1.7.1" implementation "com.google.android.material:material:1.12.0" implementation "androidx.constraintlayout:constraintlayout:2.2.1" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1" - implementation "androidx.navigation:navigation-fragment-ktx:2.9.1" - implementation "androidx.navigation:navigation-ui-ktx:2.9.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2" + implementation "androidx.navigation:navigation-fragment-ktx:2.9.3" + implementation "androidx.navigation:navigation-ui-ktx:2.9.3" implementation "com.google.zxing:core:3.5.3" implementation "androidx.room:room-runtime:2.7.2" implementation "androidx.coordinatorlayout:coordinatorlayout:1.3.0" @@ -115,8 +117,8 @@ dependencies { implementation "androidx.camera:camera-lifecycle:1.4.2" implementation "androidx.camera:camera-camera2:1.4.2" ksp "androidx.room:room-compiler:2.7.2" - implementation "androidx.work:work-runtime-ktx:2.10.2" - implementation "androidx.browser:browser:1.8.0" + implementation "androidx.work:work-runtime-ktx:2.10.3" + implementation "androidx.browser:browser:1.9.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" // DO NOT UPDATE (minSdkVersion updated) @@ -129,6 +131,19 @@ dependencies { implementation "com.google.guava:guava:33.4.8-android" playImplementation "com.google.android.play:app-update-ktx:2.1.0" playImplementation "com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.1" + + def composeBom = platform('androidx.compose:compose-bom:2025.07.00') + implementation composeBom + androidTestImplementation composeBom + implementation 'androidx.compose.material3:material3' + implementation 'androidx.compose.ui:ui-tooling-preview' + debugImplementation 'androidx.compose.ui:ui-tooling' + androidTestImplementation 'androidx.compose.ui:ui-test-junit4' + debugImplementation 'androidx.compose.ui:ui-test-manifest' + implementation 'androidx.compose.material:material-icons-extended' + implementation 'androidx.activity:activity-compose:1.10.1' + implementation 'me.zhanghai.compose.preference:library:1.1.1' + implementation "androidx.navigation:navigation-compose:2.9.3" } def playCredentialsJSON = rootProject.file("service-account-credentials.json") diff --git a/build.gradle b/build.gradle index 135472c..c3c1066 100644 --- a/build.gradle +++ b/build.gradle @@ -5,10 +5,11 @@ buildscript { } plugins { - id 'com.android.application' version '8.11.0' apply false - id 'com.android.library' version '8.11.0' apply false - id 'org.jetbrains.kotlin.android' version '2.1.0' apply false - id 'com.google.devtools.ksp' version '2.1.0-1.0.29' apply false - id 'com.github.triplet.play' version '3.8.4' apply false + id 'com.android.application' version '8.11.1' apply false + id 'com.android.library' version '8.11.1' apply false + id 'org.jetbrains.kotlin.android' version '2.2.0' apply false + id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false + id 'com.github.triplet.play' version '3.12.1' apply false + id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0' apply false } diff --git a/version.properties b/version.properties index 21a6675..dc64133 100644 --- a/version.properties +++ b/version.properties @@ -1,3 +1,3 @@ -VERSION_CODE=542 -VERSION_NAME=1.11.15 -GO_VERSION=go1.24.4 +VERSION_CODE=550 +VERSION_NAME=1.12.1 +GO_VERSION=go1.24.6