rework Gradle configuration to use id-based plugins & Kotlin's compilerOptions

Author: hrach

build.gradle.kts

@@ -1,34 +1,23 @@
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
 import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.SonatypeHost
 import java.util.Properties
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
-	alias(libs.plugins.kotlin.jvm) apply false
-	alias(libs.plugins.kotlin.android) apply false
-	alias(libs.plugins.kotlin.serialization) apply false
-	alias(libs.plugins.agp.application) apply false
-	alias(libs.plugins.kotlinter) apply false
-	alias(libs.plugins.mavenPublish) apply false
+	id("org.jetbrains.kotlin.android") version "1.8.10" apply false
+	id("org.jetbrains.kotlin.plugin.serialization") version "1.8.10" apply false
+	id("org.jmailen.kotlinter") version "3.13.0" apply false
+	id("com.android.application") version "7.4.2" apply false
+	id("com.vanniktech.maven.publish.base") version "0.24.0" apply false
 }
 
 subprojects {
-	repositories {
-		google()
-		mavenCentral()
-		maven { url = uri("https://kotlin.bintray.com/kotlinx/") }
-	}
-
-	tasks.withType<KotlinCompile>().configureEach {
-		kotlinOptions {
-			jvmTarget = "1.8"
-			allWarningsAsErrors = true
-			freeCompilerArgs = freeCompilerArgs.toMutableList().apply {
-				add("-Xskip-prerelease-check")
-			}.toList()
+	tasks.withType<KotlinJvmCompile>().configureEach {
+		compilerOptions {
+			jvmTarget.set(JvmTarget.JVM_1_8)
+			allWarningsAsErrors.set(true)
 		}
 	}
 

core/build.gradle.kts

@@ -1,11 +1,11 @@
-@file:Suppress("DSL_SCOPE_VIOLATION")
+@file:Suppress("UnstableApiUsage")
 
 plugins {
 	id("com.android.library")
-	alias(libs.plugins.kotlin.android)
-	alias(libs.plugins.mavenPublish)
-	alias(libs.plugins.kotlinter)
-	alias(libs.plugins.kotlin.serialization)
+	id("org.jetbrains.kotlin.android")
+	id("org.jetbrains.kotlin.plugin.serialization")
+	id("com.vanniktech.maven.publish.base")
+	id("org.jmailen.kotlinter")
 }
 
 android {
@@ -29,7 +29,7 @@ android {
 	}
 
 	composeOptions {
-		kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+		kotlinCompilerExtensionVersion = libs.compose.compiler.get().version
 	}
 
 	kotlinOptions {

demo/build.gradle.kts

@@ -1,10 +1,10 @@
-@file:Suppress("DSL_SCOPE_VIOLATION")
+@file:Suppress("UnstableApiUsage")
 
 plugins {
 	id("com.android.application")
-	alias(libs.plugins.kotlin.android)
-	alias(libs.plugins.kotlinter)
-	alias(libs.plugins.kotlin.serialization)
+	id("org.jetbrains.kotlin.android")
+	id("org.jetbrains.kotlin.plugin.serialization")
+	id("org.jmailen.kotlinter")
 }
 
 android {
@@ -31,7 +31,7 @@ android {
 	}
 
 	composeOptions {
-		kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+		kotlinCompilerExtensionVersion = libs.compose.compiler.get().version
 	}
 
 	buildFeatures {

gradle/libs.versions.toml

@@ -3,33 +3,13 @@
 compileSdk = "33"
 minSdk = "21"
 
-kotlin-lang = "1.8.10"
-androidGradlePlugin = "7.4.2"
-mavenPublish = "0.24.0"
-
-kotlin-serialization = "1.5.0"
-compose-compiler = "1.4.3"
-compose-main = "1.3.1"
-compose-navigation = "2.5.3"
-
 [libraries]
 
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin-lang" }
-kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version = "1.8.10" }
+kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.5.0" }
 # compiler dependency is defined to help Renovabot update the version
-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
-compose-material = { module = "androidx.compose.material:material", version.ref = "compose-main" }
-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "compose-navigation" }
+compose-compiler = { module = "androidx.compose.compiler:compiler", version = "1.4.3" }
+compose-material = { module = "androidx.compose.material:material", version = "1.3.1" }
+compose-navigation = { module = "androidx.navigation:navigation-compose", version = "2.5.3" }
 junit = { module = "junit:junit", version = "4.13.2" }
 roboletric = { module = "org.robolectric:robolectric", version = "4.9.2" }
-
-[bundles]
-
-[plugins]
-agp-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
-agp-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-lang" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-lang" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-lang" }
-mavenPublish = { id = "com.vanniktech.maven.publish.base", version.ref = "mavenPublish" }
-kotlinter = { id = "org.jmailen.kotlinter", version = "3.13.0" }

settings.gradle.kts

@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage")
+
 rootProject.name = "NavigationComposeTyped"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
@@ -22,5 +24,12 @@ pluginManagement {
     }
 }
 
+dependencyResolutionManagement {
+	repositories {
+		google()
+		mavenCentral()
+	}
+}
+
 include(":core")
 include(":demo")