diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 68caf640..667bbcd7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,7 +27,7 @@ android { defaultConfig { applicationId = "org.samo_lego.canta" - minSdk = 28 // todo - figure out a way to bypass hidden api methods on android <9 + minSdk = 28 // todo - figure out a way to bypass hidden api methods on android < 9 targetSdk = 35 versionCode = project.property("version_code")?.toString()?.toInt() ?: 1 versionName = project.property("version_name")?.toString() ?: "1.0.0" @@ -72,7 +72,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" + kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() } packaging { resources { @@ -82,6 +82,7 @@ android { } dependencies { + implementation(libs.kotlin.stdlib) implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) implementation(libs.androidx.activity.compose) diff --git a/build.gradle.kts b/build.gradle.kts index 3254742f..a3e80e56 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id("com.android.application") version "8.7.0" apply false - id("org.jetbrains.kotlin.android") version "1.9.0" apply false -} \ No newline at end of file + id("org.jetbrains.kotlin.android") version libs.versions.kotlin.get() apply false +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c8a649ff..df79c272 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,19 +1,21 @@ [versions] -activityCompose = "1.9.1" +activityCompose = "1.10.0" api = "13.1.5" -coilCompose = "2.7.0" -composeBom = "2024.06.00" -coreKtx = "1.13.1" +coilCompose = "3.1.0" +composeBom = "2025.02.00" +coreKtx = "1.15.0" espressoCore = "3.6.1" -hiddenapibypass = "4.3" +hiddenapibypass = "6.1" junit = "4.13.2" junitVersion = "1.2.1" -lifecycleRuntimeKtx = "2.8.4" -material3Android = "1.2.1" -materialIconsExtended = "1.6.8" -navigationRuntimeKtx = "2.7.7" -navigationCompose = "2.7.7" +lifecycleRuntimeKtx = "2.8.7" +material3Android = "1.3.1" +materialIconsExtended = "1.7.8" +navigationRuntimeKtx = "2.8.7" +navigationCompose = "2.8.7" provider = "13.1.5" +kotlin = "1.9.22" +composeCompiler = "1.5.8" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } @@ -33,7 +35,8 @@ androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" } androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } api = { module = "dev.rikka.shizuku:api", version.ref = "api" } -coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" } +coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" } hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version.ref = "hiddenapibypass" } junit = { module = "junit:junit", version.ref = "junit" } -provider = { module = "dev.rikka.shizuku:provider", version.ref = "provider" } \ No newline at end of file +provider = { module = "dev.rikka.shizuku:provider", version.ref = "provider" } +kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }