diff --git a/.gitignore b/.gitignore index 6e566cff..569770a4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,8 @@ build-logic/convention/build /datasource/local/build /datasource/remote/build /datasource/build -**/build \ No newline at end of file +**/build +/shared/build +/shared/data/build +/shared/datasource/build +shared/domain/build \ No newline at end of file diff --git a/README.md b/README.md index 4c8fde89..a8217a58 100644 --- a/README.md +++ b/README.md @@ -404,4 +404,4 @@ We would endlessly like to thank the following contributors - + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 84bd3dfb..27be6dda 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.droidconke.android.application) alias(libs.plugins.droidconke.android.hilt) + alias(libs.plugins.compose.compiler) alias(libs.plugins.droidconke.android.application.firebase) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3592b4fd..4b97882a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - DroidconKE2023 + DroidconKe \ No newline at end of file diff --git a/build-logic/convention/src/main/kotlin/com/android254/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/android254/AndroidCompose.kt index ba7c0dfc..c6313bdd 100644 --- a/build-logic/convention/src/main/kotlin/com/android254/AndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/com/android254/AndroidCompose.kt @@ -33,10 +33,6 @@ internal fun Project.configureAndroidCompose( compose = true } - composeOptions { - kotlinCompilerExtensionVersion = libs.findVersion("composecompiler").get().toString() - } - dependencies { val bom = libs.findLibrary("androidx-compose-bom").get() add("implementation", platform(bom)) diff --git a/build.gradle.kts b/build.gradle.kts index c65e6db6..b64e0c91 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.ksp) apply false alias(libs.plugins.kotlin.serialization) apply false diff --git a/chai/build.gradle.kts b/chai/build.gradle.kts index 12a4b065..cacb6da4 100644 --- a/chai/build.gradle.kts +++ b/chai/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.droidconke.android.library) alias(libs.plugins.droidconke.android.library.compose) + alias(libs.plugins.compose.compiler) } android { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b6cd25f2..d7d742fc 100755 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,8 +8,8 @@ espresso = "3.5.1" gradleplugin = "8.4.0" gmsPlugin = "4.4.0" hilt = "2.48.1" -kotlin = "1.9.10" -ksp = "1.9.10-1.0.13" +kotlin = "2.0.0" +ksp = "2.0.0-1.0.21" lifecycle = "2.6.2" room = "2.6.0" ktor = "2.2.2" @@ -146,7 +146,7 @@ kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", ve ksp-gradlePlugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" } [bundles] -compose = ["coil-compose", "coil-svg", "compose-activity", "compose-compiler", "compose-material-3", "compose-materialIcons", "compose-runtimeLivedata", "compose-ui", "compose-ui-util", "compose-ui-tooling", "compose-ui-tooling-preview", "paging-compose", "compose-preview-customview", "compose-preview-customview-poolingcontainer", "compose-constraintlayout", "compose-lifecycle-runtime"] +compose = ["coil-compose", "coil-svg", "compose-activity", "compose-material-3", "compose-materialIcons", "compose-runtimeLivedata", "compose-ui", "compose-ui-util", "compose-ui-tooling", "compose-ui-tooling-preview", "paging-compose", "compose-preview-customview", "compose-preview-customview-poolingcontainer", "compose-constraintlayout", "compose-lifecycle-runtime"] lifecycle = ["lifecycle-livedataKtx", "lifecycle-runtimeKtx", "lifecycle-viewmodel-compose"] room = ["room-ktx", "room-paging", "room-runtime"] ktor = ["ktor-core", "ktor-android", "ktor-json", "ktor-content-negotiation", "ktor-auth", "ktor-logging", "ktor-okhttp"] @@ -156,6 +156,7 @@ test = ["junit4", "test-junit-ktx"] [plugins] android-application = { id = "com.android.application", version.ref = "gradleplugin" } android-library = { id = "com.android.library", version.ref = "gradleplugin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin"} detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" } firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebasePerfPlugin" } diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 8024d270..bc9226ed 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -16,6 +16,7 @@ plugins { alias(libs.plugins.droidconke.android.library) alias(libs.plugins.droidconke.android.hilt) + alias(notation = libs.plugins.compose.compiler) alias(libs.plugins.droidconke.android.library.compose) } diff --git a/shared/domain/build.gradle.kts b/shared/domain/build.gradle.kts index 02ee1ce8..7247b966 100644 --- a/shared/domain/build.gradle.kts +++ b/shared/domain/build.gradle.kts @@ -18,5 +18,4 @@ kotlin { android { namespace = "ke.droidcon.kotlin.shared.domain" - compileSdk = 34 } \ No newline at end of file