Merged build config changes from dataforge

build.gradle.kts

@@ -1,4 +1,4 @@
-val kmathVersion by extra("0.1.2-dev-4")
+val kmathVersion by extra("0.1.2")
 
 allprojects {
     repositories {
@@ -11,19 +11,8 @@ allprojects {
 }
 
 subprojects {
-    // Actually, probably we should apply it to plugins explicitly
-    // We also can merge them to single kmath-publish plugin
+    apply(plugin = "dokka-publish")
     if (name.startsWith("kmath")) {
-        apply(plugin = "bintray-config")
-        apply(plugin = "artifactory-config")
+        apply(plugin = "npm-publish")
     }
-    //    dokka {
-//        outputFormat = "html"
-//        outputDirectory = javadoc.destinationDir
-//    }
-//
-//    task dokkaJar (type: Jar, dependsOn: dokka) {
-//           from javadoc . destinationDir
-//            classifier = "javadoc"
-//    }
 }

buildSrc/build.gradle.kts

@@ -12,7 +12,9 @@ val kotlinVersion = "1.3.31"
 // Add plugins used in buildSrc as dependencies, also we should specify version only here
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.5")
+    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.6")
     implementation("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.9.18")
     implementation("com.moowork.gradle:gradle-node-plugin:1.3.1")
+    implementation("org.openjfx:javafx-plugin:0.0.7")
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -5,6 +5,5 @@ object Versions {
     val ioVersion = "0.1.8"
     val coroutinesVersion = "1.2.1"
     val atomicfuVersion = "0.12.6"
-    // This version is not used and IDEA shows this property as unused
-    val dokkaVersion = "0.9.18"
+    val serializationVersion = "0.11.0"
 }

buildSrc/src/main/kotlin/dokka-publish.gradle.kts

@@ -0,0 +1,74 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+plugins {
+    id("org.jetbrains.dokka")
+    `maven-publish`
+}
+
+afterEvaluate {
+
+    extensions.findByType<KotlinMultiplatformExtension>()?.apply{
+        val dokka by tasks.getting(DokkaTask::class) {
+            outputFormat = "html"
+            outputDirectory = "$buildDir/javadoc"
+            jdkVersion = 8
+
+            kotlinTasks {
+                // dokka fails to retrieve sources from MPP-tasks so we only define the jvm task
+                listOf(tasks.getByPath("compileKotlinJvm"))
+            }
+            sourceRoot {
+                // assuming only single source dir
+                path = sourceSets["commonMain"].kotlin.srcDirs.first().toString()
+                platforms = listOf("Common")
+            }
+            // although the JVM sources are now taken from the task,
+            // we still define the jvm source root to get the JVM marker in the generated html
+            sourceRoot {
+                // assuming only single source dir
+                path = sourceSets["jvmMain"].kotlin.srcDirs.first().toString()
+                platforms = listOf("JVM")
+            }
+        }
+
+        val kdocJar by tasks.registering(Jar::class) {
+            group = JavaBasePlugin.DOCUMENTATION_GROUP
+            dependsOn(dokka)
+            archiveClassifier.set("javadoc")
+            from("$buildDir/javadoc")
+        }
+
+        configure<PublishingExtension> {
+
+            targets.all {
+                val publication = publications.findByName(name) as MavenPublication
+
+                // Patch publications with fake javadoc
+                publication.artifact(kdocJar.get())
+            }
+        }
+    }
+
+
+    extensions.findByType<KotlinJvmProjectExtension>()?.apply{
+        val dokka by tasks.getting(DokkaTask::class) {
+            outputFormat = "html"
+            outputDirectory = "$buildDir/javadoc"
+            jdkVersion = 8
+        }
+
+        val kdocJar by tasks.registering(Jar::class) {
+            group = JavaBasePlugin.DOCUMENTATION_GROUP
+            dependsOn(dokka)
+            archiveClassifier.set("javadoc")
+            from("$buildDir/javadoc")
+        }
+
+        configure<PublishingExtension> {
+            publications.filterIsInstance<MavenPublication>().forEach { publication ->
+                publication.artifact(kdocJar.get())
+            }
+        }
+    }
+}

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

@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.*
-
 plugins {
     kotlin("multiplatform")
     `maven-publish`
@@ -11,8 +9,6 @@ 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 = listOf("-progressive")
             }
         }
     }
@@ -34,35 +30,35 @@ kotlin {
         }
     }
 
-    sourceSets.invoke {
-        commonMain {
+    sourceSets {
+        val commonMain by getting {
             dependencies {
                 api(kotlin("stdlib"))
             }
         }
-        commonTest {
+        val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
             }
         }
-        "jvmMain" {
+        val jvmMain by getting {
             dependencies {
                 api(kotlin("stdlib-jdk8"))
             }
         }
-        "jvmTest" {
+        val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
             }
         }
-        "jsMain" {
+        val jsMain by getting {
             dependencies {
                 api(kotlin("stdlib-js"))
             }
         }
-        "jsTest" {
+        val jsTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))
             }
@@ -76,38 +72,6 @@ kotlin {
         }
     }
 
-    // Create empty jar for sources classifier to satisfy maven requirements
-    val stubSources by tasks.registering(Jar::class){
-        archiveClassifier.set("sources")
-        //from(sourceSets.main.get().allSource)
-    }
-
-    // Create empty jar for javadoc classifier to satisfy maven requirements
-    val stubJavadoc by tasks.registering(Jar::class) {
-        archiveClassifier.set("javadoc")
-    }
-
-
-    publishing {
-
-        publications.filterIsInstance<MavenPublication>().forEach { publication ->
-            if (publication.name == "kotlinMultiplatform") {
-                // for our root metadata publication, set artifactId with a package and project name
-                publication.artifactId = project.name
-            } else {
-                // for targets, set artifactId with a package, project name and target name (e.g. iosX64)
-                publication.artifactId = "${project.name}-${publication.name}"
-            }
-        }
-
-        targets.all {
-            val publication = publications.findByName(name) as MavenPublication
-
-            // Patch publications with fake javadoc
-            publication.artifact(stubJavadoc.get())
-        }
-    }
-
     // Apply JS test configuration
     val runJsTests by ext(false)