diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 07d4c57..d94f989 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,8 +1,10 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.compose) - kotlin("plugin.serialization") version "2.1.20" + alias(libs.plugins.serialization) } android { @@ -24,8 +26,8 @@ android { applicationId = "com.bintianqi.owndroid" minSdk = 21 targetSdk = 36 - versionCode = 39 - versionName = "7.0" + versionCode = 40 + versionName = "7.1" multiDexEnabled = false } @@ -44,11 +46,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_20 - targetCompatibility = JavaVersion.VERSION_20 - } - kotlinOptions { - jvmTarget = "20" + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } buildFeatures { compose = true @@ -67,6 +66,9 @@ android { } kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_21 + } sourceSets { all { languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index df43158..267a1b5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] -agp = "8.10.1" -kotlin = "2.1.20" +agp = "8.12.2" +kotlin = "2.2.10" -navigation-compose = "2.9.1" -composeBom = "2025.06.01" -accompanist-drawablepainter = "0.35.0-alpha" -accompanist-permissions = "0.37.0" +navigation-compose = "2.9.3" +composeBom = "2025.08.01" +accompanist-drawablepainter = "0.37.3" +accompanist-permissions = "0.37.3" shizuku = "13.1.5" -fragment = "1.8.8" +fragment = "1.8.9" dhizuku = "2.5.3" dhizuku-server = "0.0.5" -hiddenApiBypass = "4.3" +hiddenApiBypass = "6.1" libsu = "6.0.0" -serialization = "1.7.3" +serialization = "1.9.0" [libraries] androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } @@ -39,3 +39,4 @@ serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization android-application = { id = "com.android.application", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "2.2.10" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05d40d6..388b252 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jan 12 20:22:20 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://downloads.gradle.org/distributions/gradle-9.0.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists