diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cdc0dece..4ef6d662 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") id("kotlin-android") id("kotlin-kapt") id("kotlin-parcelize") @@ -16,8 +17,8 @@ android { applicationId = "app.easy.launcher" minSdk = 24 targetSdk = 34 - versionCode = 11 - versionName = "0.1.1" + versionCode = 12 + versionName = "0.1.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -65,7 +66,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.3" + kotlinCompilerExtensionVersion = "1.5.14" } applicationVariants.all { diff --git a/build.gradle.kts b/build.gradle.kts index 45b9b40d..e1785842 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,5 +2,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.dagger.android) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93a365c9..7cd67f17 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.4.1" -kotlin = "1.8.10" +kotlin = "2.0.0" coreKtx = "1.13.1" junit = "4.13.2" junitVersion = "1.1.5" @@ -17,8 +17,7 @@ preference = "1.2.1" room = "2.6.1" biometric = "1.2.0-alpha05" color-chooser = "0.7.3" -runtimeAndroid = "1.6.7" -uiAndroid = "1.6.7" +composeAndroid = "1.6.7" [libraries] core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -48,13 +47,14 @@ dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", ve junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } -androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" } -androidx-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "uiAndroid" } +androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "composeAndroid" } +androidx-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "composeAndroid" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } dagger-android = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }