buildSrc/src/main/kotlin/multiplatform-config.gradle.kts

@@ -11,6 +11,8 @@ kotlin {
         compilations.all {
             kotlinOptions {
                 jvmTarget = "1.8"
+                // This was used in kmath-koma, but probably if we need it better to apply it for all modules
+                //freeCompilerArgs += "-progressive"
             }
         }
     }

kmath-core/build.gradle.kts

@@ -1,20 +1,14 @@
 plugins {
-    id("multiplatform-config")
+    `multiplatform-config`
 }
 
-val ioVersion: String by rootProject.extra
+kotlin.sourceSets {
-
-
-kotlin {
-    sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-memory"))
         }
     }
-//        mingwMain {
+    //mingwMain {}
-//        }
+    //mingwTest {}
-//        mingwTest {
-//        }
-    }
 }
+

kmath-coroutines/build.gradle.kts

@@ -1,41 +1,22 @@
 plugins {
-    id("multiplatform-config")
+    `multiplatform-config`
 }
 
-kotlin {
+kotlin.sourceSets {
-    sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-core"))
             api("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Ver.coroutinesVersion}")
         }
     }
-        commonTest {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
     jvmMain {
         dependencies {
             api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Ver.coroutinesVersion}")
         }
     }
-        jvmTest {
-            dependencies {
-                implementation(kotlin("test"))
-                implementation(kotlin("test-junit"))
-            }
-        }
     jsMain {
         dependencies {
             api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Ver.coroutinesVersion}")
         }
     }
-        jsTest {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
-        }
-    }
 }

kmath-histograms/build.gradle.kts

@@ -1,30 +1,10 @@
 plugins {
-    id("multiplatform-config")
+    `multiplatform-config`
 }
 
-kotlin {
+// Just an example how we can collapse nested DSL for simple declarations
-    sourceSets {
+kotlin.sourceSets.commonMain {
-        commonMain {
     dependencies {
         api(project(":kmath-core"))
     }
 }
-        commonTest {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation(kotlin("test"))
-                implementation(kotlin("test-junit"))
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
-        }
-    }
-}

kmath-koma/build.gradle.kts

@@ -1,33 +1,18 @@
 plugins {
-    id("multiplatform-config")
+    `multiplatform-config`
 }
 
 repositories {
     maven("http://dl.bintray.com/kyonifer/maven")
 }
 
-kotlin {
+kotlin.sourceSets {
-    jvm {
-        compilations.all {
-            kotlinOptions {
-                freeCompilerArgs += "-progressive"
-            }
-        }
-    }
-
-    sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-core"))
             api("com.kyonifer:koma-core-api-common:0.12")
         }
     }
-        commonTest {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
     jvmMain {
         dependencies {
             api("com.kyonifer:koma-core-api-jvm:0.12")
@@ -35,8 +20,6 @@ kotlin {
     }
     jvmTest {
         dependencies {
-                implementation(kotlin("test"))
-                implementation(kotlin("test-junit"))
             implementation("com.kyonifer:koma-core-ejml:0.12")
         }
     }
@@ -45,10 +28,4 @@ kotlin {
             api("com.kyonifer:koma-core-api-js:0.12")
         }
     }
-        jsTest {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
-        }
-    }
 }

kmath-memory/build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-    id("multiplatform-config")
+    `multiplatform-config`
 }

kmath-sequential/build.gradle.kts

@@ -1,10 +1,9 @@
 plugins {
-    id("multiplatform-config")
+    `multiplatform-config`
     id("kotlinx-atomicfu") version Ver.atomicfuVersion
 }
 
-kotlin {
+kotlin.sourceSets {
-    sourceSets {
     commonMain {
         dependencies {
             api(project(":kmath-core"))
@@ -24,7 +23,6 @@ kotlin {
     }
 
 }
-}
 
 atomicfu {
     variant = "VH"