chore: adjust project config for Kotlin 2.0

svenjacobs · May 26, 2024 · d3dd59f · d3dd59f
1 parent 53aef5a
commit d3dd59f
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ captures
 local.properties
 xcuserdata
 kotlin-js-store
+.kotlin
diff --git a/android-tests/build.gradle.kts b/android-tests/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
 	alias(libs.plugins.android.application)
 	alias(libs.plugins.jetbrains.kotlin.android)
+	alias(libs.plugins.compose.compiler)
 }
 
 val androidMinSdk: Int by rootProject.extra
@@ -39,14 +40,10 @@ android {
 	kotlinOptions {
 		jvmTarget = "11"
 	}
+}
 
-	buildFeatures {
-		compose = true
-	}
-
-	composeOptions {
-		kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-	}
+composeCompiler {
+	enableStrongSkippingMode = true
 }
 
 dependencies {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,6 +11,7 @@ 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.nexus.publish)
 	alias(libs.plugins.ben.manes.versions)
 	alias(libs.plugins.kotlinter)

diff --git a/convention-plugins/build.gradle.kts b/convention-plugins/build.gradle.kts
@@ -22,4 +22,9 @@ dependencies {
 		name = "compose-gradle-plugin",
 		version = libs.findVersion("jetbrains-compose").get().requiredVersion,
 	)
+	implementation(
+		group = "org.jetbrains.kotlin.plugin.compose",
+		name = "org.jetbrains.kotlin.plugin.compose.gradle.plugin",
+		version = libs.findVersion("kotlin").get().requiredVersion,
+	)
 }
diff --git a/convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts b/convention-plugins/src/main/kotlin/convention.multiplatform.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
 	kotlin("multiplatform")
 	id("org.jetbrains.compose")
+	id("org.jetbrains.kotlin.plugin.compose")
 }
 
 val baseName: String by extra

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -33,6 +33,7 @@ android-library = { id = "com.android.library", version.ref = "android-gradle-pl
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ben-manes-versions = "com.github.ben-manes.versions:0.51.0"
 nexus-publish = "io.github.gradle-nexus.publish-plugin:2.0.0"
 kotlinter = "org.jmailen.kotlinter:4.3.0"
diff --git a/reveal-common/build.gradle.kts b/reveal-common/build.gradle.kts
@@ -50,14 +50,6 @@ android {
 		sourceCompatibility = JavaVersion.VERSION_11
 		targetCompatibility = JavaVersion.VERSION_11
 	}
-
-	buildFeatures {
-		compose = true
-	}
-
-	composeOptions {
-		kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-	}
 }
 
 dependencies {

diff --git a/reveal-compat-android/build.gradle.kts b/reveal-compat-android/build.gradle.kts
@@ -44,14 +44,6 @@ android {
 		freeCompilerArgs += "-Xexplicit-api=strict"
 	}
 
-	buildFeatures {
-		compose = true
-	}
-
-	composeOptions {
-		kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-	}
-
 	publishing {
 		singleVariant("release") {
 			withSourcesJar()

diff --git a/reveal-core/build.gradle.kts b/reveal-core/build.gradle.kts
@@ -53,14 +53,6 @@ android {
 		sourceCompatibility = JavaVersion.VERSION_11
 		targetCompatibility = JavaVersion.VERSION_11
 	}
-
-	buildFeatures {
-		compose = true
-	}
-
-	composeOptions {
-		kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-	}
 }
 
 dependencies {

diff --git a/reveal-shapes/build.gradle.kts b/reveal-shapes/build.gradle.kts
@@ -50,14 +50,6 @@ android {
 		sourceCompatibility = JavaVersion.VERSION_11
 		targetCompatibility = JavaVersion.VERSION_11
 	}
-
-	buildFeatures {
-		compose = true
-	}
-
-	composeOptions {
-		kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-	}
 }
 
 dependencies {