chore: move common logic into conventional plugin (#267)

Resolves #266

Author: OptimumCode

.github/workflows/codeql.yml

@@ -53,7 +53,14 @@ jobs:
       with:
         gradle-version: wrapper
     - name: Build
-      run: ./gradlew --no-daemon -S -Dorg.gradle.dependency.verification=off -Dorg.gradle.warning.mode=none testClasses
+      run: >
+        ./gradlew
+        --no-daemon
+        -S
+        -Dorg.gradle.dependency.verification=off
+        -Dorg.gradle.warning.mode=none
+        jvmTestClasses
+        jsTestClasses
 
     # Perform analysis
     - name: Perform CodeQL Analysis

benchmark/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  alias(libs.plugins.kotlin.mutliplatform)
+  convention.kotlin
   alias(libs.plugins.kotlin.benchmark)
   alias(libs.plugins.kotlin.allopen)
 }
@@ -9,7 +9,6 @@ allOpen {
 }
 
 kotlin {
-  jvmToolchain(11)
   jvm()
   macosX64()
   macosArm64()

build.gradle.kts

@@ -1,5 +1,4 @@
 plugins {
-  alias(libs.plugins.kotlin.mutliplatform) apply false
   alias(libs.plugins.kotlin.binaryCompatibility)
   alias(libs.plugins.nexus.publish)
   convention.properties

buildSrc/build.gradle.kts

@@ -4,4 +4,8 @@ plugins {
 
 repositories {
   gradlePluginPortal()
+}
+
+dependencies {
+  implementation(libs.kotlin.gradle.plugin)
 }

buildSrc/settings.gradle.kts

@@ -1 +1,9 @@
-rootProject.name = "buildSrc"
+rootProject.name = "buildSrc"
+
+dependencyResolutionManagement {
+  versionCatalogs {
+    create("libs") {
+      from(files("../gradle/libs.versions.toml"))
+    }
+  }
+}

buildSrc/src/main/kotlin/convention.kotlin.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+  kotlin("multiplatform")
+}
+
+kotlin {
+  jvmToolchain(11)
+}

buildSrc/src/main/kotlin/convention.mutliplatform-lib.gradle.kts

@@ -0,0 +1,41 @@
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+
+plugins {
+  id("convention.kotlin")
+}
+
+kotlin {
+  explicitApi()
+
+  jvm {
+    testRuns["test"].executionTask.configure {
+      useJUnitPlatform()
+    }
+  }
+  js(IR) {
+    browser()
+    generateTypeScriptDefinitions()
+    nodejs()
+  }
+
+  @OptIn(ExperimentalWasmDsl::class)
+  wasmJs {
+    // The wasmJsBrowserTest prints all executed tests as one unformatted string
+    // Have not found a way to suppress printing all this into console
+    browser()
+    nodejs()
+  }
+
+  applyDefaultHierarchyTemplate()
+
+  macosX64()
+  macosArm64()
+  iosX64()
+  iosArm64()
+  iosSimulatorArm64()
+
+  linuxX64()
+  linuxArm64()
+
+  mingwX64()
+}

buildSrc/src/main/kotlin/convention.mutliplatform-tests.gradle.kts

@@ -0,0 +1,36 @@
+import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
+
+plugins {
+  id("convention.kotlin")
+}
+
+val macOsAllTest by tasks.register("macOsAllTest") {
+  group = "verification"
+  description = "runs all tests for MacOS and IOS targets"
+}
+
+val windowsAllTest by tasks.register("windowsAllTest") {
+  group = "verification"
+  description = "runs all tests for Windows targets"
+}
+val linuxAllTest by tasks.register("linuxAllTest") {
+  group = "verification"
+  description = "runs all tests for Linux targets"
+}
+
+kotlin.targets.configureEach {
+  if (this !is KotlinTargetWithTests<*, *>) {
+    return@configureEach
+  }
+  when {
+    name.startsWith("ios") || name.startsWith("macos") -> {
+      macOsAllTest.dependsOn(tasks.named("${name}Test"))
+    }
+    name.startsWith("mingw") -> {
+      windowsAllTest.dependsOn(tasks.named("${name}Test"))
+    }
+    else -> {
+      linuxAllTest.dependsOn(tasks.named("${name}Test"))
+    }
+  }
+}

gradle/libs.versions.toml

@@ -10,7 +10,6 @@ openapi = "2025.1"
 jackson = "2.18.2"
 
 [plugins]
-kotlin-mutliplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "benchmark" }
 kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
@@ -42,6 +41,7 @@ networknt-validator = { group = "com.networknt", name = "json-schema-validator",
 kotlin-codepoints = { group = "de.cketti.unicode", name = "kotlin-codepoints", version = "0.9.0" }
 normalize = { group = "com.doist.x", name = "normalize", version = "1.1.1" }
 karacteristics = { group = "io.github.optimumcode", name = "karacteristics", version = "0.0.4" }
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 
 [bundles]
 openapi = ["openapi-validator", "openapi-interfaces", "openapi-jackson"]

json-schema-validator-objects/build.gradle.kts

@@ -3,12 +3,12 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
-import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 plugins {
-  alias(libs.plugins.kotlin.mutliplatform)
+  convention.kotlin
+  convention.`mutliplatform-lib`
+  convention.`mutliplatform-tests`
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.kotest.multiplatform)
   alias(libs.plugins.kover)
@@ -18,51 +18,10 @@ plugins {
 }
 
 kotlin {
-  explicitApi()
-
   @OptIn(ExperimentalKotlinGradlePluginApi::class)
   compilerOptions {
     freeCompilerArgs.add("-opt-in=io.github.optimumcode.json.schema.ExperimentalApi")
   }
-  jvmToolchain(11)
-  jvm {
-    testRuns["test"].executionTask.configure {
-      useJUnitPlatform()
-    }
-  }
-  js(IR) {
-    browser()
-    generateTypeScriptDefinitions()
-    nodejs()
-  }
-  wasmJs {
-    // The wasmJsBrowserTest prints all executed tests as one unformatted string
-    // Have not found a way to suppress printing all this into console
-    browser()
-    nodejs()
-  }
-
-  applyDefaultHierarchyTemplate()
-
-  val macOsTargets =
-    listOf<KotlinTarget>(
-      macosX64(),
-      macosArm64(),
-      iosX64(),
-      iosArm64(),
-      iosSimulatorArm64(),
-    )
-
-  val linuxTargets =
-    listOf<KotlinTarget>(
-      linuxX64(),
-      linuxArm64(),
-    )
-
-  val windowsTargets =
-    listOf<KotlinTarget>(
-      mingwX64(),
-    )
 
   sourceSets {
     commonMain {
@@ -101,34 +60,6 @@ kotlin {
       }
     }
   }
-
-  afterEvaluate {
-    fun Task.dependsOnTargetTests(targets: List<KotlinTarget>) {
-      targets.forEach {
-        if (it is KotlinTargetWithTests<*, *>) {
-          dependsOn(tasks.getByName("${it.name}Test"))
-        }
-      }
-    }
-    tasks.register("macOsAllTest") {
-      group = "verification"
-      description = "runs all tests for MacOS and IOS targets"
-      dependsOnTargetTests(macOsTargets)
-    }
-    tasks.register("windowsAllTest") {
-      group = "verification"
-      description = "runs all tests for Windows targets"
-      dependsOnTargetTests(windowsTargets)
-    }
-    tasks.register("linuxAllTest") {
-      group = "verification"
-      description = "runs all tests for Linux targets"
-      dependsOnTargetTests(linuxTargets)
-      dependsOn(tasks.getByName("jvmTest"))
-      dependsOn(tasks.getByName("jsTest"))
-      dependsOn(tasks.getByName("wasmJsTest"))
-    }
-  }
 }
 
 ktlint {
@@ -138,12 +69,12 @@ ktlint {
   }
 }
 
-afterEvaluate {
-  val detektAllTask by tasks.register("detektAll") {
-    dependsOn(tasks.withType<Detekt>())
-  }
+val detektAllTask by tasks.register("detektAll")
 
-  tasks.named("check").configure {
-    dependsOn(detektAllTask)
-  }
+tasks.named("check").configure {
+  dependsOn(detektAllTask)
+}
+
+tasks.withType<Detekt> {
+  detektAllTask.dependsOn(this)
 }