KTOR-7501 Use target hierarchy DSL

ktorio · Sep 26, 2024 · f68b079 · f68b079
1 parent 2ab6575
commit f68b079
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 326 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -108,15 +108,15 @@ doctor {
     enableTestCaching = false
 }
 
-allprojects {
+subprojects {
     group = "io.ktor"
     version = configuredVersion
     extra["hostManager"] = HostManager()
 
     setupTrainForSubproject()
 
     val nonDefaultProjectStructure: List<String> by rootProject.extra
-    if (nonDefaultProjectStructure.contains(project.name)) return@allprojects
+    if (nonDefaultProjectStructure.contains(project.name)) return@subprojects
 
     apply(plugin = "kotlin-multiplatform")
     apply(plugin = "atomicfu-conventions")
@@ -138,9 +138,7 @@ allprojects {
     if (!skipPublish.contains(project.name)) {
         configurePublication()
     }
-}
 
-subprojects {
     configureCodestyle()
 }
 

diff --git a/buildSrc/src/main/kotlin/JsConfig.kt b/buildSrc/src/main/kotlin/JsConfig.kt
@@ -9,9 +9,15 @@ import org.jetbrains.kotlin.gradle.targets.js.ir.*
 import java.io.*
 
 fun Project.configureJs() {
-    configureJsTasks()
+    val nodeJsEnabled = project.targetIsEnabled("js.nodeJs")
+    val browserEnabled = project.targetIsEnabled("js.browser")
 
     kotlin {
+        js {
+            if (nodeJsEnabled) nodejs()
+            if (browserEnabled) browser()
+        }
+
         sourceSets {
             jsTest {
                 dependencies {
@@ -21,13 +27,14 @@ fun Project.configureJs() {
         }
     }
 
+    configureJsTasks(nodeJsEnabled)
     configureJsTestTasks()
 }
 
-private fun Project.configureJsTasks() {
+private fun Project.configureJsTasks(nodeJsEnabled: Boolean) {
     kotlin {
         js {
-            if (project.targetIsEnabled("js.nodeJs")) {
+            if (nodeJsEnabled) {
                 nodejs {
                     testTask {
                         useMocha {