diff --git a/.gitignore b/.gitignore index 347e252..8743149 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ local.properties # Log/OS Files *.log +.kotlin/ # Android Studio generated files and folders captures/ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 61edb90..94c2a8c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.jetbrains.kotlin.android) + alias(libs.plugins.compose.compiler) } android { @@ -39,9 +40,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/build.gradle.kts b/build.gradle.kts index 26dcfcd..0f24cf7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,8 +2,9 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false - id("org.jetbrains.dokka") version "1.9.20" alias(libs.plugins.android.library) apply false + alias(libs.plugins.compose.compiler) apply false + id("org.jetbrains.dokka") version "1.9.20" } tasks.dokkaHtmlMultiModule { diff --git a/coverflow/build.gradle.kts b/coverflow/build.gradle.kts index 692699d..f2ae08e 100644 --- a/coverflow/build.gradle.kts +++ b/coverflow/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.jetbrains.kotlin.android) + alias(libs.plugins.compose.compiler) id("kotlin-parcelize") } @@ -34,9 +35,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" - } publishing { singleVariant("release") { withJavadocJar() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index adbcd64..a861a6c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,3 +37,4 @@ androidx-material3-android = { group = "androidx.compose.material3", name = "mat android-application = { id = "com.android.application", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } android-library = { id = "com.android.library", version.ref = "agp" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }