diff --git a/gradle/build-logic/src/main/kotlin/KotlinConfig.kt b/gradle/build-logic/src/main/kotlin/KotlinConfig.kt deleted file mode 100644 index 86fe3f2..0000000 --- a/gradle/build-logic/src/main/kotlin/KotlinConfig.kt +++ /dev/null @@ -1,14 +0,0 @@ -import org.jetbrains.kotlin.gradle.dsl.* - -fun KotlinProjectExtension.kotlinConfig() { - explicitApi() - - jvmToolchain(8) - - sourceSets.configureEach { - languageSettings { - progressiveMode = true - optIn("kotlin.uuid.ExperimentalUuidApi") - } - } -} diff --git a/gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts b/gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts index a947124..5dc1e92 100644 --- 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 index 60aef65..724391a 100644 --- 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 index 55b985e..3a7a271 100644 --- 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 index b30df21..adf0627 100644 --- 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 index 11b9f06..1ebca8c 100644 --- 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 {