Update to Kotlin 1.3.50 RC and get rid of CLI lib dependency

Author: orangy

examples/build.gradle

@@ -12,7 +12,6 @@ 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" } // 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.41"
+    kotlin("plugin.allopen") version "1.3.50-release-105"
     id("kotlinx.benchmark") version "0.2.0" 
 }
 

examples/kotlin-multiplatform/build.gradle

@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
     id 'org.jetbrains.kotlin.multiplatform'
-    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.41"
+    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.50-release-105"
     id 'kotlinx.benchmark' version "0.2.0"
 }
 
@@ -31,7 +31,9 @@ kotlin {
     }
 
     js {
-        nodejs()
+        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.41"
+    id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.50-release-105"
     id 'kotlinx.benchmark' version '0.2.0' 
 }
 

gradle.properties

@@ -3,12 +3,11 @@ group = org.jetbrains.kotlinx
 version = 0.2.0
 
 kotlin.code.style=official
-kotlin_version=1.3.41
+kotlin_version=1.3.50-release-105
 jmhVersion=1.21
 junit_version=4.12
 
-infra_version=0.1.0-dev-47
-cli_version=0.1.0-dev-5
+infra_version=0.1.0-dev-49
 
 node_version = 8.9.4
 npm_version = 5.7.1

plugin/build.gradle

@@ -13,7 +13,7 @@ buildscript {
 
 plugins {
     id 'java-gradle-plugin'
-    id 'org.jetbrains.kotlin.jvm' version "1.3.41"
+    id 'org.jetbrains.kotlin.jvm' version "1.3.50-release-105"
 }
 
 apply plugin: 'kotlinx.team.infra'

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.41
+kotlin_version=1.3.50-release-105
 jmhVersion=1.21
-infra_version=0.1.0-dev-47
+infra_version=0.1.0-dev-49
 

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

@@ -40,7 +40,7 @@ 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, 40, null))
+                if (VersionNumber.parse(kotlinPluginVersion) < VersionNumber(1, 3, 50, null))
                     logger.error("JetBrains Gradle Benchmarks plugin requires Kotlin version 1.3.40 or higher")
             }
         }

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

@@ -11,10 +11,8 @@ fun Project.createJsBenchmarkExecTask(
     target: JsBenchmarkTarget,
     compilation: KotlinJsCompilation
 ) {
-    task<JsBenchmarkExec>(
-        "${target.name}${config.capitalizedName()}${BenchmarksPlugin.BENCHMARK_EXEC_SUFFIX}",
-        depends = config.prefixName(RUN_BENCHMARKS_TASKNAME)
-    ) {
+    val taskName = "${target.name}${config.capitalizedName()}${BenchmarksPlugin.BENCHMARK_EXEC_SUFFIX}"
+    val task = NodeJsExec.create(compilation, taskName) {
         dependsOn(compilation.runtimeDependencyFiles)
 
         group = BenchmarksPlugin.BENCHMARKS_TASK_GROUP
@@ -30,40 +28,17 @@ fun Project.createJsBenchmarkExecTask(
         workingDir = compilation.npmProject.dir
 
         onlyIf { executableFile.exists() }
-
-        args("-n", target.name)
-        args("-r", reportFile.toString())
-        config.iterations?.let { args("-i", it.toString()) }
-        config.warmups?.let { args("-w", it.toString()) }
-        config.iterationTime?.let { args("-it", it.toString()) }
-        config.iterationTimeUnit?.let { args("-itu", it) }
-        config.outputTimeUnit?.let { args("-otu", it) }
-        config.mode?.let { args("-m", it) }
-
-        config.includes.forEach {
-            args("-I", it)
-        }
-        config.excludes.forEach {
-            args("-E", it)
-        }
-        config.params.forEach { (param, values) ->
-            values.forEach { value -> args("-P", "\"$param=$value\"") }
-        }
+        
 
         doFirst {
             val ideaActive = (extensions.extraProperties.get("idea.internal.test") as? String)?.toBoolean() ?: false
-            args("-t", if (ideaActive) "xml" else "text")
+            args(writeParameters(target.name, reportFile, if (ideaActive) "xml" else "text", config))
             reportsDir.mkdirs()
             logger.lifecycle("Running '${config.name}' benchmarks for '${target.name}'")
         }
     }
-}
 
-open class JsBenchmarkExec : NodeJsExec() {
-/*
-    @Option(option = "filter", description = "Configures the filter for benchmarks to run.")
-    var filter: String? = null
-*/
+    tasks.getByName(config.prefixName(RUN_BENCHMARKS_TASKNAME)).dependsOn(task.getTaskOrProvider())
 }
 
 

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

@@ -4,6 +4,7 @@ import org.gradle.api.*
 import org.gradle.api.file.*
 import org.gradle.api.tasks.*
 import org.gradle.workers.*
+import org.jetbrains.kotlin.builtins.*
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.*
@@ -80,6 +81,7 @@ open class JsSourceGeneratorTask
         dependencies: List<ModuleDescriptorImpl> = listOf()
     ): List<ModuleDescriptorImpl> {
         val modules = KotlinJavascriptMetadataUtils.loadMetadata(lib)
+        val builtIns = org.jetbrains.kotlin.js.resolve.JsPlatformAnalyzerServices.builtIns
         return modules.map { metadata ->
             val skipCheck = languageVersionSettings.getFlag(AnalysisFlags.skipMetadataVersionCheck)
             assert(metadata.version.isCompatible() || skipCheck) {
@@ -89,7 +91,7 @@ open class JsSourceGeneratorTask
             val module = ModuleDescriptorImpl(
                 Name.special("<" + metadata.moduleName + ">"),
                 storageManager,
-                JsPlatform.builtIns
+                builtIns
             )
             val (header, body) = KotlinJavascriptSerializationUtil.readModuleAsProto(
                 metadata.body,
@@ -104,7 +106,7 @@ open class JsSourceGeneratorTask
                 CompilerDeserializationConfiguration(languageVersionSettings),
                 LookupTracker.DO_NOTHING
             )
-            module.setDependencies(listOf(module, JsPlatform.builtIns.builtInsModule) + dependencies)
+            module.setDependencies(listOf(module, builtIns.builtInsModule) + dependencies)
             module.initialize(provider)
             module
         }