Replace kotlin-targets with Targets.kt

kordlib · Mar 4, 2024 · 92d05e7 · 92d05e7
1 parent 5869b9a
commit 92d05e7
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 20 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,6 +12,7 @@ repositories {
 kotlin {
     compilerOptions {
         allWarningsAsErrors = true
+        freeCompilerArgs.add("-Xcontext-receivers")
     }
 }
 

diff --git a/...c/src/main/kotlin/kord-targets.gradle.kts → buildSrc/src/main/kotlin/Targets.kt b/...c/src/main/kotlin/kord-targets.gradle.kts → buildSrc/src/main/kotlin/Targets.kt
@@ -1,10 +1,10 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
+import org.jetbrains.kotlin.gradle.kpm.external.project
 import org.jetbrains.kotlin.konan.target.HostManager
 
-plugins {
-    org.jetbrains.kotlin.multiplatform
-}
-
-kotlin {
+@OptIn(ExternalVariantApi::class)
+fun KotlinMultiplatformExtension.targets() {
     // There are issues with compiling the linux variant on windows
     // Please use WSL if you need to work on the linux port
     if (!HostManager.hostIsMingw) {
@@ -14,7 +14,7 @@ kotlin {
 
     jvm()
 
-    if (name != "voice" && name != "core-voice") {
+    if (project.name != "voice" && project.name != "core-voice") {
         mingwX64()
         js {
             nodejs()

diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
@@ -36,6 +36,7 @@ kotlin {
         }
     }
 
+    targets()
     explicitApi()
     jvmToolchain(Jvm.target)
 

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -2,13 +2,13 @@ import dev.kord.gradle.tools.util.commitHash
 import dev.kord.gradle.tools.util.shortCommitHash
 
 plugins {
-    `kord-targets`
     `kord-multiplatform-module`
     `kord-publishing`
     alias(libs.plugins.buildconfig)
 }
 
 kotlin {
+    targets()
     sourceSets {
         commonMain {
             dependencies {

diff --git a/core-voice/build.gradle.kts b/core-voice/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    `kord-targets`
     `kord-multiplatform-module`
     `kord-publishing`
 }

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    `kord-targets`
     `kord-multiplatform-module`
     `kord-publishing`
 }

diff --git a/core/live-tests/build.gradle.kts b/core/live-tests/build.gradle.kts
@@ -1,8 +1,9 @@
 plugins {
-    `kord-targets`
+    org.jetbrains.kotlin.multiplatform
 }
 
 kotlin {
+    targets()
     sourceSets {
         all {
             applyKordOptIns()

diff --git a/gateway/build.gradle.kts b/gateway/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    `kord-targets`
     `kord-multiplatform-module`
     `kord-publishing`
 }

diff --git a/ksp-annotations/build.gradle.kts b/ksp-annotations/build.gradle.kts
@@ -1,13 +1,16 @@
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 
 plugins {
-    `kord-targets`
-
+    org.jetbrains.kotlin.multiplatform
     // workaround for https://youtrack.jetbrains.com/issue/KT-43500 (not intended to be published)
     org.jetbrains.dokka
     `kord-publishing`
 }
 
+kotlin {
+    targets()
+}
+
 tasks.withType<AbstractDokkaLeafTask>().configureEach {
     dokkaSourceSets.configureEach {
         suppress = true

diff --git a/rest/build.gradle.kts b/rest/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    `kord-targets`
     `kord-multiplatform-module`
     `kord-publishing`
 }

diff --git a/samples/build.gradle.kts b/samples/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.konan.target.Family
 
 plugins {
-    `kord-targets`
+    org.jetbrains.kotlin.multiplatform
 }
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
@@ -17,9 +17,7 @@ kotlin {
             }
         }
     }
-    js {
-        binaries.executable()
-    }
+    targets()
 
     targets.withType<KotlinNativeTarget> {
         // Voice does not target windows, so we disable it

diff --git a/test-kit/build.gradle.kts b/test-kit/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
-    `kord-targets`
+    org.jetbrains.kotlin.multiplatform
 }
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
@@ -15,6 +15,7 @@ kotlin {
             }
         }
     }
+    targets()
     sourceSets {
         commonMain {
             dependencies {

diff --git a/voice/build.gradle.kts b/voice/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-    `kord-targets`
     `kord-multiplatform-module`
     `kord-publishing`
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ kotlin { @@
             }
         }
+        targets()
         explicitApi()
         jvmToolchain(Jvm.target)
@@ Expand Down @@