MPP: Build logic organization/refactoring & Kotlin/JS tests with Mocha

Author: elizarov

build.gradle

@@ -14,12 +14,14 @@ buildscript {
     repositories {
         jcenter()
         maven { url "http://kotlin.bintray.com/kotlinx" }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
         classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicFU_version"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
+        classpath "com.moowork.gradle:gradle-node-plugin:$gradle_node_version"
     }
 }
 
@@ -78,7 +80,10 @@ configure(subprojects.findAll { !sourceless.contains(it.name)  }) {
     kotlin.experimental.coroutines "enable"
 
     tasks.withType(Test) {
-        testLogging.showStandardStreams = true
+        testLogging {
+            showStandardStreams = true
+            events "passed", "failed"
+        }
         def stressTest = project.properties['stressTest']
         if (stressTest != null) systemProperties['stressTest'] = stressTest
     }
@@ -109,6 +114,10 @@ configure(subprojects.findAll { !sourceless.contains(it.name)  }) {
             testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
         }
     }
+
+    if (platform == "js") {
+        apply from: rootProject.file('gradle/test-js.gradle')
+    }
 }
 
 // --------------- Configure sub-projects that are part of the library ---------------
@@ -167,105 +176,28 @@ def core_docs_url = "https://kotlin.github.io/kotlinx.coroutines/kotlinx-corouti
 def core_docs_file = "$projectDir/core/kotlinx-coroutines-core/build/dokka/kotlinx-coroutines-core/package-list"
 
 configure(subprojects.findAll { !unpublished.contains(it.name) }) {
-    def platform = platformOf(it)
-
-    apply plugin: 'maven'
-    apply plugin: 'maven-publish'
-    apply plugin: 'org.jetbrains.dokka'
-    apply plugin: 'com.jfrog.bintray'
-
-    dokka {
-        outputFormat = 'kotlin-website'
-    }
-
-    if (platform == "jvm") {
-        // real xxx-javadoc.jar for JVM
-        task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
-            outputFormat = 'javadoc'
-            outputDirectory = "$buildDir/javadoc"
-        }
-
-        task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
-            classifier = 'javadoc'
-            from "$buildDir/javadoc"
-        }
-    } else {
-        // empty xxx-javadoc.jar
-        task javadocJar(type: Jar) {
-            classifier = 'javadoc'
-            from "$buildDir/javadoc" // would not exist
-        }
-    }
-
-    tasks.withType(org.jetbrains.dokka.gradle.DokkaTask) {
-        jdkVersion = 8
-        includes = ['README.md']
-        linkMapping {
-            def relPath = rootProject.projectDir.toPath().relativize(projectDir.toPath())
-            dir = "$projectDir/src/main/kotlin"
-            url = "http://github.com/kotlin/kotlinx.coroutines/tree/master/$relPath/src/main/kotlin"
-            suffix = "#L"
-        }
-    }
+    apply from: rootProject.file('gradle/dokka.gradle')
+    apply from: rootProject.file('gradle/publish-bintray.gradle')
+}
 
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
+configure(subprojects.findAll { !unpublished.contains(it.name) }) {
+    def platform = platformOf(it)
+    def coroutines_core = platformLib("kotlinx-coroutines-core", platform)
 
-    publishing {
-        publications {
-            maven(MavenPublication) {
-                from components.java
-                artifact javadocJar
-                artifact sourcesJar
-                pom.withXml {
-                    def root = asNode()
-                    root.appendNode('name', project.name)
-                    root.appendNode('description', 'Coroutines support libraries for Kotlin')
-                    root.appendNode('url', 'https://github.com/Kotlin/kotlinx.coroutines')
-                    root.children().last() + pomConfig
-                }
-            }
-        }
-    }
+    if (it.name != coroutines_core) {
+        dokka.dependsOn project(":$coroutines_core").dokka
 
-    bintray {
-        user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-        key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-        publications = ['maven']
-        pkg {
-            userOrg = 'kotlin'
-            repo = 'kotlinx'
-            name = 'kotlinx.coroutines'
-            version {
-                name = project.version
-                vcsTag = project.version
-                released  = new Date()
+        tasks.withType(dokka.getClass()) {
+            externalDocumentationLink {
+                url = new URL(core_docs_url)
+                packageListUrl = new URL("file://$core_docs_file")
             }
         }
     }
-
-    bintrayUpload.doLast {
-        println("Uploaded $project.name version $project.version")
-    }
-}
-
-configure(subprojects.findAll { !unpublished.contains(it.name) && it.name != 'kotlinx-coroutines-core-common' }) {
-    def platform = platformOf(it)
-    def coroutines_core = platformLib("kotlinx-coroutines-core", platform)
-
-    dokka.dependsOn project(":$coroutines_core").dokka
+    
     if (platform == "jvm") {
         dokkaJavadoc.dependsOn project(":$coroutines_core").dokka
     }
-
-    tasks.withType(org.jetbrains.dokka.gradle.DokkaTask) {
-        externalDocumentationLink {
-            url = new URL(core_docs_url)
-            packageListUrl = new URL("file://$core_docs_file")
-        }
-    }
 }
 
 apply plugin: 'base'

common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/CommonScheduled.kt

@@ -0,0 +1,2 @@
+package kotlinx.coroutines.experimental
+

gradle.properties

@@ -1,8 +1,10 @@
 version = 0.20-SNAPSHOT
 
-kotlin_version = 1.2.0
+kotlin_version = 1.2.10
 junit_version = 4.12
 atomicFU_version = 0.9.2
 lincheck_version=1.9
 dokka_version = 0.9.15
+bintray_version = 1.7.3
+gradle_node_version = 1.2.0
 

gradle/dokka.gradle

@@ -0,0 +1,39 @@
+// Configures generation of JavaDoc & Dokka artifacts
+
+def platform = platformOf(project)
+
+apply plugin: 'org.jetbrains.dokka'
+
+dokka {
+    outputFormat = 'kotlin-website'
+}
+
+if (platform == "jvm") {
+    // real xxx-javadoc.jar for JVM
+    task dokkaJavadoc(type: dokka.getClass()) {
+        outputFormat = 'javadoc'
+        outputDirectory = "$buildDir/javadoc"
+    }
+
+    task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
+        classifier = 'javadoc'
+        from "$buildDir/javadoc"
+    }
+} else {
+    // empty xxx-javadoc.jar
+    task javadocJar(type: Jar) {
+        classifier = 'javadoc'
+        from "$buildDir/javadoc" // would not exist
+    }
+}
+
+tasks.withType(dokka.getClass()) {
+    jdkVersion = 8
+    includes = ['README.md']
+    linkMapping {
+        def relPath = rootProject.projectDir.toPath().relativize(projectDir.toPath())
+        dir = "$projectDir/src/main/kotlin"
+        url = "http://github.com/kotlin/kotlinx.coroutines/tree/master/$relPath/src/main/kotlin"
+        suffix = "#L"
+    }
+}

gradle/publish-bintray.gradle

@@ -0,0 +1,47 @@
+// Configures publishing of Maven artifacts to Bintray
+
+apply plugin: 'maven'
+apply plugin: 'maven-publish'
+apply plugin: 'com.jfrog.bintray'
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            artifact javadocJar
+            artifact sourcesJar
+            pom.withXml {
+                def root = asNode()
+                root.appendNode('name', project.name)
+                root.appendNode('description', 'Coroutines support libraries for Kotlin')
+                root.appendNode('url', 'https://github.com/Kotlin/kotlinx.coroutines')
+                root.children().last() + pomConfig
+            }
+        }
+    }
+}
+
+bintray {
+    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
+    key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
+    publications = ['maven']
+    pkg {
+        userOrg = 'kotlin'
+        repo = 'kotlinx'
+        name = 'kotlinx.coroutines'
+        version {
+            name = project.version
+            vcsTag = project.version
+            released  = new Date()
+        }
+    }
+}
+
+bintrayUpload.doLast {
+    println("Uploaded $project.name version $project.version")
+}

gradle/test-js.gradle

@@ -0,0 +1,43 @@
+// Configures testing for JS modules
+
+apply plugin: 'com.moowork.node'
+
+tasks.withType(compileKotlin2Js.getClass()) {
+    kotlinOptions {
+        moduleKind = "umd"
+        sourceMap = true
+        metaInfo = true
+    }
+}
+
+task populateNodeModules(type: Copy, dependsOn: compileKotlin2Js) {
+    from compileKotlin2Js.destinationDir
+
+    configurations.testCompile.each {
+        from zipTree(it.absolutePath).matching {
+            include '*.js'
+            include '*.js.map'
+        }
+    }
+
+    into "${buildDir}/node_modules"
+}
+
+node {
+    download = true
+}
+
+task installDependencies(type: NpmTask) {
+    args = ['install', 'mocha', 'source-map-support']
+    if (project.hasProperty("teamcity")) args += 'mocha-teamcity-reporter'
+}
+
+task prepareMocha(dependsOn: [compileTestKotlin2Js, populateNodeModules, installDependencies])
+
+task runMocha(type: NodeTask, dependsOn: prepareMocha) {
+    script = file('node_modules/mocha/bin/mocha')
+    args = [compileTestKotlin2Js.outputFile, '--require=source-map-support/register']
+    if (project.hasProperty("teamcity")) args += '--reporter=mocha-teamcity-reporter'
+}
+
+test.dependsOn runMocha

js/kotlinx-coroutines-core-js/src/main/kotlin/kotlinx/coroutines/experimental/Scheduled.kt

@@ -0,0 +1,2 @@
+package kotlinx.coroutines.experimental
+