Migrate to 1.3.40 EAP

Author: orangy

build.gradle

@@ -3,7 +3,9 @@ buildscript {
         jcenter()
         gradlePluginPortal()
 //        maven { url "../kotlin-libraries-infra/build/maven" }
-        maven { url "https://dl.bintray.com/orangy/maven" }
+        maven { url "https://dl.bintray.com/orangy/maven" } // for kotlinx.cli & infra
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
 
     dependencies {
@@ -14,6 +16,11 @@ buildscript {
 
 apply plugin: 'kotlinx.team.infra'
 
+repositories {
+    maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+    maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+}
+
 infra {
     teamcity {
         projectName = "kotlinx-benchmark"
@@ -33,13 +40,6 @@ infra {
             password = findProperty('bintrayApiKey')
         }
     }
-
-    node {
-        version = '10.15.1'
-        mocha('4.1.0')
-        install("source-map-support", "0.5.3")
-        install("mocha-teamcity-reporter", "2.2.2")
-    }
 }
 
 afterEvaluate {

examples/build.gradle

@@ -12,7 +12,7 @@ subprojects {
         mavenCentral()
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
-        maven { url "https://dl.bintray.com/orangy/maven" }
+        maven { url "https://dl.bintray.com/orangy/maven" } // for kotlinx.cli
 //        maven { url "$rootProject.projectDir/../kotlin-libraries-infra/build/maven" }
     }
 }

examples/kotlin-kts/build.gradle.kts

@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.*
 plugins {
     java
     kotlin("jvm") 
-    kotlin("plugin.allopen") version "1.3.30"
+    kotlin("plugin.allopen") version "1.3.40-eap-104"
     id("kotlinx.benchmark") version "0.2.0" 
 }
 

examples/kotlin-multiplatform/build.gradle

@@ -6,26 +6,24 @@ buildscript {
 
 plugins {
     id 'org.jetbrains.kotlin.multiplatform'
-    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.30"
+    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.40-eap-104"
     id 'kotlinx.benchmark' version "0.2.0"
     id 'kotlinx.team.node'
 }
 
-node {
-    version = '10.15.1'
-}
-
 // how to apply plugin to a specific source set?
 allOpen {
     annotation("org.openjdk.jmh.annotations.State")
 }
 
 kotlin {
+/*
     infra {
         target('macosX64')
         target('linuxX64')
         target('mingwX64')
     }
+*/
 
     jvm {
         compilations.all {
@@ -36,12 +34,7 @@ kotlin {
     }
 
     js {
-        compilations.all {
-            kotlinOptions {
-                sourceMap = true
-                moduleKind = "umd"
-            }
-        }
+        nodejs()
     }
 
     sourceSets.all {

examples/kotlin/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' 
-    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.30"
+    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.40-eap-104"
     id 'kotlinx.benchmark' version '0.2.0' 
 }
 

gradle.properties

@@ -3,7 +3,7 @@ group = org.jetbrains.kotlinx
 version = 0.2.0
 
 kotlin.code.style=official
-kotlin_version=1.3.31
+kotlin_version=1.3.40-eap-104
 jmhVersion=1.21
 junit_version=4.12
 

plugin/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
         jcenter()
         // maven { url "../../kotlin-libraries-infra/build/maven" }
-        maven { url "https://dl.bintray.com/orangy/maven" }
+        maven { url "https://dl.bintray.com/orangy/maven" } // for kotlinx.cli & infra
     }
     dependencies {
         classpath "kotlinx.team:kotlinx.team.infra:$infra_version"
@@ -13,7 +13,7 @@ buildscript {
 
 plugins {
     id 'java-gradle-plugin'
-    id 'org.jetbrains.kotlin.jvm' version "1.3.30"
+    id 'org.jetbrains.kotlin.jvm' version "1.3.40-eap-104"
 }
 
 apply plugin: 'kotlinx.team.infra'
@@ -40,7 +40,7 @@ repositories {
     maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
 //    maven { url "../../kotlin-libraries-infra/build/maven" }
-    maven { url "https://dl.bintray.com/orangy/maven" }
+    maven { url "https://dl.bintray.com/orangy/maven" } // for kotlinx.cli & infra
 }
 
 gradlePlugin {

plugin/gradle.properties

@@ -7,7 +7,7 @@ group = org.jetbrains.kotlinx
 # Put link to your OSS repository. Bintray requires this to be filled for free OpenSource tiers.
 vcs=https://github.com/kotlin/kotlinx-benchmark
 
-kotlin_version=1.3.30
+kotlin_version=1.3.40-eap-104
 jmhVersion=1.21
 infra_version=0.1.0-dev-47
 

plugin/main/src/kotlinx/benchmark/gradle/BenchmarksPlugin.kt

@@ -41,8 +41,8 @@ class BenchmarksPlugin : Plugin<Project> {
         if (kotlinClass != null) {
             plugins.findPlugin(kotlinClass)?.run {
                 logger.info("Detected Kotlin plugin version '$kotlinPluginVersion'")
-                if (VersionNumber.parse(kotlinPluginVersion) < VersionNumber(1, 3, 30, null))
-                    logger.error("JetBrains Gradle Benchmarks plugin requires Kotlin version 1.3.30 or higher")
+                if (VersionNumber.parse(kotlinPluginVersion) < VersionNumber(1, 3, 40, null))
+                    logger.error("JetBrains Gradle Benchmarks plugin requires Kotlin version 1.3.40 or higher")
             }
         }
 

plugin/main/src/kotlinx/benchmark/gradle/JsMultiplatformTasks.kt

@@ -1,25 +1,17 @@
 package kotlinx.benchmark.gradle
 
-import kotlinx.team.infra.node.*
 import org.gradle.api.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 
 fun Project.processJsCompilation(target: JsBenchmarkTarget) {
-    if (!plugins.hasPlugin(NodePlugin::class.java)) {
-        logger.info("Enabling node plugin in $this")
-        pluginManager.apply(NodePlugin::class.java)
-    }
-
     project.logger.info("Configuring benchmarks for '${target.name}' using Kotlin/JS")
     val compilation = target.compilation
 
     configureMultiplatformJsCompilation(target)
 
-    createJsBenchmarkInstallTask()
     createJsBenchmarkGenerateSourceTask(target, compilation)
 
     val benchmarkCompilation = createJsBenchmarkCompileTask(target)
-    createJsBenchmarkDependenciesTask(target, benchmarkCompilation)
     target.extension.configurations.forEach {
         createJsBenchmarkExecTask(it, target, benchmarkCompilation)
     }
@@ -38,6 +30,8 @@ private fun Project.createJsBenchmarkCompileTask(target: JsBenchmarkTarget): Kot
         sourceSet.dependencies {
             implementation(compilation.compileDependencyFiles)
             implementation(compilation.output.allOutputs)
+            implementation(npm("benchmark"))
+            runtimeOnly(npm("source-map-support"))
         }
         compileKotlinTask.apply {
             group = BenchmarksPlugin.BENCHMARKS_TASK_GROUP