Simplify Gradle setup

hfhbd · Aug 29, 2024 · d9005df · d9005df
1 parent ba7c990
commit d9005df
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 27 deletions.
diff --git a/gradle/build-logic/src/main/kotlin/KotlinConfig.kt b/gradle/build-logic/src/main/kotlin/KotlinConfig.kt
diff --git a/gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts b/gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts
@@ -1,8 +1,12 @@
 plugins {
     kotlin("multiplatform")
+    id("publish")
+    id("dokkaLicensee")
 }
 
 kotlin {
+    jvmToolchain(8)
+
     jvm()
     js(IR) {
         browser()
@@ -35,5 +39,9 @@ kotlin {
     mingwX64()
     watchosDeviceArm64()
 
-    kotlinConfig()
+    explicitApi()
+    compilerOptions {
+        progressiveMode.set(true)
+        optIn.add("kotlin.uuid.ExperimentalUuidApi")
+    }
 }
diff --git a/gradle/build-logic/src/main/kotlin/publish.gradle.kts b/gradle/build-logic/src/main/kotlin/publish.gradle.kts
@@ -1,5 +1,3 @@
-import java.util.*
-
 plugins {
     id("maven-publish")
     id("signing")
@@ -10,10 +8,8 @@ val emptyJar by tasks.registering(Jar::class)
 publishing {
     publications.configureEach {
         this as MavenPublication
-        if (project.name != "kotlinx-uuid-exposed") {
-            artifact(emptyJar) {
-                classifier = "javadoc"
-            }
+        artifact(emptyJar) {
+            classifier = "javadoc"
         }
         pom {
             name.set("app.softwork UUID Library")

diff --git a/kotlinx-uuid-core/build.gradle.kts b/kotlinx-uuid-core/build.gradle.kts
@@ -7,8 +7,6 @@ import org.jetbrains.kotlin.gradle.plugin.*
 
 plugins {
     id("kotlinMPP")
-    id("publish")
-    id("dokkaLicensee")
     id("kover")
     id("com.android.library")
     kotlin("plugin.parcelize")

diff --git a/kotlinx-uuid-datetime/build.gradle.kts b/kotlinx-uuid-datetime/build.gradle.kts
@@ -5,8 +5,6 @@
 
 plugins {
     id("kotlinMPP")
-    id("publish")
-    id("dokkaLicensee")
 }
 
 kotlin.sourceSets {

diff --git a/kotlinx-uuid-sqldelight/build.gradle.kts b/kotlinx-uuid-sqldelight/build.gradle.kts
@@ -3,8 +3,6 @@
  */
 plugins {
     id("kotlinMPP")
-    id("publish")
-    id("dokkaLicensee")
 }
 
 kotlin {