Moved compile-options-conventions inside kotlin-jvm-conventions and k…

…otlin-multiplatform-conventions
Kotlin · Jun 19, 2024 · d322f10 · d322f10
1 parent da5f4cf
commit d322f10
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 5 deletions.
diff --git a/atomicfu-maven-plugin/build.gradle.kts b/atomicfu-maven-plugin/build.gradle.kts
@@ -5,7 +5,6 @@
 plugins {
     `maven-publish`
     id("kotlin-jvm-conventions")
-    id("compile-options-conventions")
 }
 
 dependencies {

diff --git a/atomicfu-transformer/build.gradle.kts b/atomicfu-transformer/build.gradle.kts
@@ -4,7 +4,6 @@
 
 plugins {
     id("kotlin-jvm-conventions")
-    id("compile-options-conventions")
 }
 
 dependencies {

diff --git a/atomicfu/build.gradle b/atomicfu/build.gradle
@@ -6,7 +6,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     id("kotlin-multiplatform-conventions")
-    id("compile-options-conventions")
     id("publish-conventions")
 }
 

diff --git a/...in/compile-options-conventions.gradle.kts → ...kotlin/kotlin-base-conventions.gradle.kts b/...in/compile-options-conventions.gradle.kts → ...kotlin/kotlin-base-conventions.gradle.kts
@@ -1,6 +1,5 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
-// TODO(Dmitrii Krasnov): https://github.com/Kotlin/kotlinx-atomicfu/issues/421
-//      convert this script to a kotlin-jvm convention
+
 val kotlin = extensions.getByType<KotlinProjectExtension>()
 
 kotlin.sourceSets.configureEach {

diff --git a/buildSrc/src/main/kotlin/kotlin-jvm-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-jvm-conventions.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     kotlin("jvm")
     id("publish-conventions")
     id("common-conventions")
+    id("kotlin-base-conventions")
 }
 
 // MPP projects pack their sources automatically, java libraries need to explicitly pack them

diff --git a/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts
@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
 plugins {
     kotlin("multiplatform")
     id("common-conventions")
+    id("kotlin-base-conventions")
 }
 
 tasks.withType<Kotlin2JsCompile>().configureEach {