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
+    apply(plugin = "dokka-publish")
-    // We also can merge them to single kmath-publish plugin
     if (name.startsWith("kmath")) {
-        apply(plugin = "bintray-config")
+        apply(plugin = "npm-publish")
-        apply(plugin = "artifactory-config")
     }
-    //    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 serializationVersion = "0.11.0"
-    val dokkaVersion = "0.9.18"
 }

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

@@ -1,38 +0,0 @@
-import groovy.lang.GroovyObject
-import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig
-import org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig
-
-plugins {
-    id("com.jfrog.artifactory")
-}
-
-artifactory {
-    val artifactoryUser: String? by project
-    val artifactoryPassword: String? by project
-    val artifactoryContextUrl = "http://npm.mipt.ru:8081/artifactory"
-
-    setContextUrl(artifactoryContextUrl)//The base Artifactory URL if not overridden by the publisher/resolver
-    publish(delegateClosureOf<PublisherConfig> {
-        repository(delegateClosureOf<GroovyObject> {
-            setProperty("repoKey", "gradle-dev-local")
-            setProperty("username", artifactoryUser)
-            setProperty("password", artifactoryPassword)
-        })
-
-        defaults(delegateClosureOf<GroovyObject>{
-            invokeMethod("publications", arrayOf("jvm", "js", "kotlinMultiplatform", "metadata"))
-            //TODO: This property is not available for ArtifactoryTask
-            //setProperty("publishBuildInfo", false)
-            setProperty("publishArtifacts", true)
-            setProperty("publishPom", true)
-            setProperty("publishIvy", false)
-        })
-    })
-    resolve(delegateClosureOf<ResolverConfig> {
-        repository(delegateClosureOf<GroovyObject> {
-            setProperty("repoKey", "gradle-dev")
-            setProperty("username", artifactoryUser)
-            setProperty("password", artifactoryPassword)
-        })
-    })
-}

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

@@ -1,97 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-import com.jfrog.bintray.gradle.BintrayExtension.PackageConfig
-import com.jfrog.bintray.gradle.BintrayExtension.VersionConfig
-
-// Old bintray.gradle script converted to real Gradle plugin (precompiled script plugin)
-// It now has own dependencies and support type safe accessors
-// Syntax is pretty close to what we had in Groovy
-// (excluding Property.set and bintray dynamic configs)
-
-plugins {
-    id("com.jfrog.bintray")
-    `maven-publish`
-}
-
-val vcs = "https://github.com/mipt-npm/kmath"
-
-// Configure publishing
-publishing {
-    repositories {
-        maven("https://bintray.com/mipt-npm/scientifik")
-    }
-
-    // Process each publication we have in this project
-    publications.filterIsInstance<MavenPublication>().forEach { publication ->
-
-        // use type safe pom config GSL insterad of old dynamic
-        publication.pom {
-            name.set(project.name)
-            description.set(project.description)
-            url.set(vcs)
-
-            licenses {
-                license {
-                    name.set("The Apache Software License, Version 2.0")
-                    url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                    distribution.set("repo")
-                }
-            }
-            developers {
-                developer {
-                    id.set("MIPT-NPM")
-                    name.set("MIPT nuclear physics methods laboratory")
-                    organization.set("MIPT")
-                    organizationUrl.set("http://npm.mipt.ru")
-                }
-
-            }
-            scm {
-                url.set(vcs)
-            }
-        }
-
-    }
-}
-
-bintray {
-    // delegates for runtime properties
-    val bintrayUser: String? by project
-    val bintrayApiKey: String? by project
-    user = bintrayUser ?: System.getenv("BINTRAY_USER")
-    key = bintrayApiKey ?: System.getenv("BINTRAY_API_KEY")
-    publish = true
-    override = true // for multi-platform Kotlin/Native publishing
-
-    // We have to use delegateClosureOf because bintray supports only dynamic groovy syntax
-    // this is a problem of this plugin
-    pkg(delegateClosureOf<PackageConfig> {
-        userOrg = "mipt-npm"
-        repo = "scientifik"
-        name = "scientifik.kmath"
-        issueTrackerUrl = "https://github.com/mipt-npm/kmath/issues"
-        setLicenses("Apache-2.0")
-        vcsUrl = vcs
-        version(delegateClosureOf<VersionConfig> {
-            name = project.version.toString()
-            vcsTag = project.version.toString()
-            released = java.util.Date().toString()
-        })
-    })
-
-    tasks {
-        bintrayUpload {
-            dependsOn(publishToMavenLocal)
-            doFirst {
-                setPublications(project.publishing.publications
-                    .filterIsInstance<MavenPublication>()
-                    .filter { !it.name.contains("-test") && it.name != "kotlinMultiplatform" }
-                    .map {
-                        println("""Uploading artifact "${it.groupId}:${it.artifactId}:${it.version}" from publication "${it.name}""")
-                        it.name //https://github.com/bintray/gradle-bintray-plugin/issues/256
-                    })
-            }
-        }
-
-    }
-}

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/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 {
+    sourceSets {
-        commonMain {
+        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)
 

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

@@ -0,0 +1,136 @@
+@file:Suppress("UnstableApiUsage")
+
+import com.jfrog.bintray.gradle.tasks.BintrayUploadTask
+import groovy.lang.GroovyObject
+import org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact
+import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig
+import org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig
+
+// Old bintray.gradle script converted to real Gradle plugin (precompiled script plugin)
+// It now has own dependencies and support type safe accessors
+// Syntax is pretty close to what we had in Groovy
+// (excluding Property.set and bintray dynamic configs)
+
+plugins {
+    `maven-publish`
+    id("com.jfrog.bintray")
+    id("com.jfrog.artifactory")
+}
+
+val vcs = "https://github.com/mipt-npm/kmath"
+val bintrayRepo = "https://bintray.com/mipt-npm/scientifik"
+
+// Configure publishing
+publishing {
+    repositories {
+        maven(bintrayRepo)
+    }
+
+    // Process each publication we have in this project
+    publications.filterIsInstance<MavenPublication>().forEach { publication ->
+
+        // use type safe pom config GSL instead of old dynamic
+        publication.pom {
+            name.set(project.name)
+            description.set(project.description)
+            url.set(vcs)
+
+            licenses {
+                license {
+                    name.set("The Apache Software License, Version 2.0")
+                    url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                    distribution.set("repo")
+                }
+            }
+            developers {
+                developer {
+                    id.set("MIPT-NPM")
+                    name.set("MIPT nuclear physics methods laboratory")
+                    organization.set("MIPT")
+                    organizationUrl.set("http://npm.mipt.ru")
+                }
+
+            }
+            scm {
+                url.set(vcs)
+            }
+        }
+    }
+
+}
+
+bintray {
+    user = findProperty("bintrayUser") as? String ?: System.getenv("BINTRAY_USER")
+    key = findProperty("bintrayApiKey") as? String? ?: System.getenv("BINTRAY_API_KEY")
+    publish = true
+    override = true // for multi-platform Kotlin/Native publishing
+
+    // We have to use delegateClosureOf because bintray supports only dynamic groovy syntax
+    // this is a problem of this plugin
+    pkg.apply {
+        userOrg = "mipt-npm"
+        repo = "scientifik"
+        name = project.name
+        issueTrackerUrl = "$vcs/issues"
+        setLicenses("Apache-2.0")
+        vcsUrl = vcs
+        version.apply {
+            name = project.version.toString()
+            vcsTag = project.version.toString()
+            released = java.util.Date().toString()
+        }
+    }
+
+    //workaround bintray bug
+    afterEvaluate {
+        setPublications(*publishing.publications.names.toTypedArray())
+    }
+
+    tasks {
+        bintrayUpload {
+            dependsOn(publishToMavenLocal)
+        }
+    }
+}
+
+//workaround for bintray
+tasks.withType<BintrayUploadTask> {
+    doFirst {
+        publishing.publications
+            .filterIsInstance<MavenPublication>()
+            .forEach { publication ->
+                val moduleFile = buildDir.resolve("publications/${publication.name}/module.json")
+                if (moduleFile.exists()) {
+                    publication.artifact(object : FileBasedMavenArtifact(moduleFile) {
+                        override fun getDefaultExtension() = "module"
+                    })
+                }
+            }
+    }
+}
+
+artifactory {
+    val artifactoryUser: String? by project
+    val artifactoryPassword: String? by project
+    val artifactoryContextUrl = "http://npm.mipt.ru:8081/artifactory"
+
+    setContextUrl(artifactoryContextUrl)//The base Artifactory URL if not overridden by the publisher/resolver
+    publish(delegateClosureOf<PublisherConfig> {
+        repository(delegateClosureOf<GroovyObject> {
+            setProperty("repoKey", "gradle-dev-local")
+            setProperty("username", artifactoryUser)
+            setProperty("password", artifactoryPassword)
+        })
+
+        defaults(delegateClosureOf<GroovyObject> {
+            invokeMethod("publications", arrayOf("jvm", "js", "kotlinMultiplatform", "metadata"))
+        })
+    })
+    resolve(delegateClosureOf<ResolverConfig> {
+        repository(delegateClosureOf<GroovyObject> {
+            setProperty("repoKey", "gradle-dev")
+            setProperty("username", artifactoryUser)
+            setProperty("password", artifactoryPassword)
+        })
+    })
+}

kmath-core/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `multiplatform-config`
+    `npm-multiplatform`
 }
 
 kotlin.sourceSets {

kmath-coroutines/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `multiplatform-config`
+    `npm-multiplatform`
     id("kotlinx-atomicfu") version Versions.atomicfuVersion
 }
 

kmath-histograms/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `multiplatform-config`
+    `npm-multiplatform`
 }
 
 // Just an example how we can collapse nested DSL for simple declarations

kmath-koma/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `multiplatform-config`
+    `npm-multiplatform`
 }
 
 repositories {

kmath-memory/build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-    `multiplatform-config`
+    `npm-multiplatform`
 }

kmath-prob/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `multiplatform-config`
+    `npm-multiplatform`
     id("kotlinx-atomicfu") version Versions.atomicfuVersion
 }
 

settings.gradle.kts

@@ -1,15 +1,16 @@
 pluginManagement {
     repositories {
-        mavenCentral()
+        jcenter()
         gradlePluginPortal()
-        //maven ("https://dl.bintray.com/kotlin/kotlin-eap")
+        maven("https://dl.bintray.com/kotlin/kotlin-eap")
     }
     resolutionStrategy {
         eachPlugin {
             when (requested.id.id) {
-                "kotlinx-atomicfu" -> {
+                "kotlinx-atomicfu" -> useModule("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${requested.version}")
-                    useModule("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${requested.version}")
+                "kotlin-multiplatform" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-                }
+                "kotlin2js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
+                //"org.jetbrains.kotlin.frontend" -> useModule("org.jetbrains.kotlin:kotlin-frontend-plugin:0.0.45")
             }
         }
     }