Update Kotlin version to 1.3.70

Author: Abduqodiri Qurbonzoda

build.gradle

@@ -2,10 +2,7 @@ buildscript {
     repositories {
         jcenter()
         gradlePluginPortal()
-//        maven { url "../kotlin-libraries-infra/build/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' }
+        maven { url 'https://dl.bintray.com/kotlin/kotlinx' }
     }
 
     dependencies {
@@ -16,11 +13,6 @@ 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"

examples/build.gradle

@@ -10,8 +10,5 @@ subprojects {
 
         mavenLocal()
         mavenCentral()
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
-//        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
-//        maven { url "$rootProject.projectDir/../kotlin-libraries-infra/build/maven" }
     }
 }

examples/kotlin-multiplatform/build.gradle

@@ -1,9 +1,3 @@
-buildscript {
-    repositories {
-//        maven { url "$rootProject.projectDir/../kotlin-libraries-infra/build/maven" }
-    }
-}
-
 plugins {
     id 'org.jetbrains.kotlin.multiplatform'
     id 'org.jetbrains.kotlin.plugin.allopen' version "1.3.50"

gradle.properties

@@ -3,13 +3,14 @@ group = org.jetbrains.kotlinx
 version = 0.2.0
 
 kotlin.code.style=official
-kotlin_version=1.3.50
+kotlin_version=1.3.70
 jmhVersion=1.21
 junit_version=4.12
 
-infra_version=0.1.0-dev-49
+infra_version=0.1.0-dev-52
 
 node_version = 8.9.4
 npm_version = 5.7.1
 
 kotlin.incremental.multiplatform=true
+org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

plugin/build.gradle

@@ -2,8 +2,7 @@ buildscript {
     repositories {
         mavenCentral()
         jcenter()
-        // maven { url "../../kotlin-libraries-infra/build/maven" }
-        maven { url "https://dl.bintray.com/orangy/maven" } // for kotlinx.cli & infra
+        maven { url 'https://dl.bintray.com/kotlin/kotlinx' }
     }
     dependencies {
         classpath "kotlinx.team:kotlinx.team.infra:$infra_version"
@@ -38,10 +37,6 @@ repositories {
     mavenCentral()
     jcenter()
     gradlePluginPortal()
-    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" } // for kotlinx.cli & infra
 }
 
 gradlePlugin {
@@ -74,16 +69,16 @@ dependencies {
     compile 'com.squareup:kotlinpoet:1.3.0'
     compile "org.openjdk.jmh:jmh-core:$jmhVersion"
 
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-native-library-reader', version: kotlin_version, {
-        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-compiler'
-    }
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-util-klib-metadata', version: kotlin_version
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-util-klib', version: kotlin_version
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-util-io', version: kotlin_version
 
     compileOnly group: 'org.jetbrains.kotlin.multiplatform', name: 'org.jetbrains.kotlin.multiplatform.gradle.plugin', version: kotlin_version
     compileOnly "org.openjdk.jmh:jmh-generator-bytecode:$jmhVersion" // used in worker
 
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testImplementation gradleTestKit()
-    testImplementation 'junit:junit:4.12'
+    testImplementation "junit:junit:$junit_version"
 
 /*
     // This is needed for test to get it on classpath and run

plugin/gradle.properties

@@ -7,7 +7,8 @@ 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.50
+kotlin_version=1.3.70
 jmhVersion=1.21
-infra_version=0.1.0-dev-49
+junit_version=4.12
+infra_version=0.1.0-dev-52
 

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

@@ -38,7 +38,7 @@ fun Project.createJsBenchmarkExecTask(
         }
     }
 
-    tasks.getByName(config.prefixName(RUN_BENCHMARKS_TASKNAME)).dependsOn(task.getTaskOrProvider())
+    tasks.getByName(config.prefixName(RUN_BENCHMARKS_TASKNAME)).dependsOn(task)
 }
 
 

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

@@ -25,9 +25,12 @@ fun Project.processNativeCompilation(target: NativeBenchmarkTarget) {
     }
 }
 
+private fun generateSourceTaskName(target: NativeBenchmarkTarget)
+        = target.name + BenchmarksPlugin.BENCHMARK_GENERATE_SUFFIX
+
 private fun Project.createNativeBenchmarkGenerateSourceTask(target: NativeBenchmarkTarget) {
     val benchmarkBuildDir = benchmarkBuildDir(target)
-    task<NativeSourceGeneratorTask>("${target.name}${BenchmarksPlugin.BENCHMARK_GENERATE_SUFFIX}") {
+    task<NativeSourceGeneratorTask>(generateSourceTaskName(target)) {
         group = BenchmarksPlugin.BENCHMARKS_TASK_GROUP
         description = "Generate Native source files for '${target.name}'"
         val compilation = target.compilation
@@ -52,7 +55,9 @@ private fun Project.createNativeBenchmarkCompileTask(target: NativeBenchmarkTarg
     // In the previous version of this method a compileTask was changed to build an executable instead of klib.
     // Currently it's impossible to change task output kind and an executable is always produced by
     // a link task. So we disable execution the klib compiling task to save time.
-    benchmarkCompilation.compileKotlinTask.enabled = false
+//    benchmarkCompilation.compileKotlinTask.enabled = false
+
+    benchmarkCompilation.compileKotlinTask.dependsOn(generateSourceTaskName(target))
 
     benchmarkCompilation.apply {
         val sourceSet = kotlinSourceSets.single()
@@ -73,7 +78,7 @@ private fun Project.createNativeBenchmarkCompileTask(target: NativeBenchmarkTarg
                 linkTask.apply {
                     group = BenchmarksPlugin.BENCHMARKS_TASK_GROUP
                     description = "Compile Native benchmark source files for '${compilationTarget.name}'"
-                    dependsOn("${compilationTarget.name}${BenchmarksPlugin.BENCHMARK_GENERATE_SUFFIX}")
+                    dependsOn(generateSourceTaskName(target))
 
                     // It's impossible to change output directory using the binaries DSL.
                     // See https://youtrack.jetbrains.com/issue/KT-29395

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

@@ -6,16 +6,16 @@ import org.gradle.api.tasks.*
 import org.gradle.workers.*
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.konan.library.*
-import org.jetbrains.kotlin.konan.library.impl.*
-import org.jetbrains.kotlin.konan.properties.*
-import org.jetbrains.kotlin.konan.target.*
 import org.jetbrains.kotlin.konan.util.*
-import org.jetbrains.kotlin.storage.*
+import org.jetbrains.kotlin.builtins.*
+import org.jetbrains.kotlin.serialization.konan.*
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
+import org.jetbrains.kotlin.util.Logger
+import org.jetbrains.kotlin.library.*
+import org.jetbrains.kotlin.library.impl.*
+import org.jetbrains.kotlin.library.resolver.impl.*
 import java.io.*
-import java.nio.file.*
 import javax.inject.*
-import kotlin.reflect.jvm.*
 
 @Suppress("UnstableApiUsage")
 @CacheableTask
@@ -59,6 +59,9 @@ open class NativeSourceGeneratorTask
     }
 }
 
+private val Builtins = DefaultBuiltIns.Instance
+private val NativeFactories = KlibMetadataFactories( { Builtins }, NullFlexibleTypeDeserializer)
+
 class NativeSourceGeneratorWorker
 @Inject constructor(
     private val title: String,
@@ -91,32 +94,30 @@ class NativeSourceGeneratorWorker
         if (nativeTarget.isEmpty())
             throw Exception("nativeTarget should be specified for API generator for native targets")
 
-        val hostManager = HostManager()
-        val konanTarget = hostManager.targetByName(nativeTarget)
-        val versionSpec = LanguageVersionSettingsImpl(
-            LanguageVersion.LATEST_STABLE,
-            ApiVersion.LATEST_STABLE
-        )
-        val ABI_VERSION = 8
-
-        val pathResolver = ProvidedPathResolver(dependencyPaths, konanTarget)
-        val libraryResolver = pathResolver.libraryResolver(ABI_VERSION)
+        val logger = object : Logger {
+            override fun log(message: String) {}
+            override fun error(message: String) = kotlin.error("e: $message")
+            override fun warning(message: String) {}
+            override fun fatal(message: String) = kotlin.error("e: $message")
+        }
+        val pathResolver = SeveralKlibComponentResolver(dependencyPaths.map { it.canonicalPath }, listOf(KotlinAbiVersion.CURRENT), logger)
+        val libraryResolver = pathResolver.libraryResolver()
 
-        val factory = KonanFactories.DefaultDeserializedDescriptorFactory
+        val factory = NativeFactories.DefaultDeserializedDescriptorFactory
 
         val konanFile = org.jetbrains.kotlin.konan.file.File(lib.canonicalPath)
+        val library = createKotlinLibrary(konanFile)
 
-        val library = reflectCreateKonanLibrary(konanFile, ABI_VERSION, konanTarget)
-        val unresolvedDependencies = library.manifestProperties.propertyList(KLIB_PROPERTY_DEPENDS)
+        val versionSpec = LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE)
         val storageManager = LockBasedStorageManager("Inspect")
 
-        val module = factory.createDescriptorAndNewBuiltIns(library, versionSpec, storageManager)
+        val module = factory.createDescriptorOptionalBuiltIns(library, versionSpec, storageManager, Builtins, null)
 
-        val dependencies = libraryResolver.resolveWithDependencies(unresolvedDependencies)
-        val dependenciesResolved = KonanFactories.DefaultResolvedDescriptorsFactory.createResolved(
+        val dependencies = libraryResolver.resolveWithDependencies(library.unresolvedDependencies)
+        val dependenciesResolved = NativeFactories.DefaultResolvedDescriptorsFactory.createResolved(
             dependencies,
             storageManager,
-            null,
+            Builtins,
             versionSpec
         )
 
@@ -127,61 +128,14 @@ class NativeSourceGeneratorWorker
         return module
     }
 
-    companion object {
-        private fun reflectCreateKonanLibrary(
-            libraryFile: org.jetbrains.kotlin.konan.file.File,
-            abi: Int,
-            konanTarget: KonanTarget
-        ): KonanLibrary {
-            val clazz = Class.forName("org.jetbrains.kotlin.konan.library.KonanLibraryUtilsKt")
-            val method = clazz.methods.single { it.name == "createKonanLibrary" }.kotlinFunction
-            val params = method!!.parameters
-            if (params[1].name == "currentAbiVersion") {
-                // new mode
-                return createKonanLibrary(libraryFile, abi, konanTarget, false)
-            } else {
-                return method.call(libraryFile, konanTarget, false, DefaultMetadataReaderImpl) as KonanLibrary
-            }
-        }
-    }
-
-
-    private class ProvidedPathResolver(private val dependencies: Set<File>, override val target: KonanTarget) :
-        SearchPathResolverWithTarget {
-
-        override val searchRoots: List<org.jetbrains.kotlin.konan.file.File> get() = emptyList()
-
-        private val nameMap = dependencies
-            // TODO: what's wrong with JARs? They seem common libs, how does native ignores them?
-            .filter { it.extension != "jar" }
-            .map {
-                val file = org.jetbrains.kotlin.konan.file.File(it.absolutePath)
-                // Need to load library to know its uniqueName, some libs like atomicfu has it different from klib file name
-                reflectCreateKonanLibrary(file, 1, target)
-            }
-            .associateBy { it.uniqueName }
-            .mapValues { it.value.libraryFile }
-
-        override fun resolve(givenPath: String): org.jetbrains.kotlin.konan.file.File {
-            val path = Paths.get(givenPath)
-            return when {
-                path.isAbsolute -> org.jetbrains.kotlin.konan.file.File(path)
-                else -> {
-                    val file = nameMap[givenPath]
-                    if (file != null)
-                        return file
-
-                    println("Cannot resolve library $givenPath with the following dependencies:")
-                    println(dependencies.joinToString(prefix = "  ", separator = "\n  "))
-                    throw Exception("Cannot resolve library '$givenPath' with $nameMap")
-                }
-            }
-        }
-
-        override fun defaultLinks(
-            noStdLib: Boolean,
-            noDefaultLibs: Boolean
-        ): List<org.jetbrains.kotlin.konan.file.File> =
-            emptyList()
+    private class SeveralKlibComponentResolver(
+        klibFiles: List<String>,
+        knownAbiVersions: List<KotlinAbiVersion>?,
+        logger: Logger
+    ) : KotlinLibraryProperResolverWithAttributes<KotlinLibrary>(
+        emptyList(), klibFiles, knownAbiVersions, emptyList(),
+        null, null, false, logger, emptyList()
+    ) {
+        override fun libraryBuilder(file: org.jetbrains.kotlin.konan.file.File, isDefault: Boolean) = createKotlinLibrary(file, isDefault)
     }
 }

plugin/settings.gradle

@@ -2,8 +2,6 @@ pluginManagement {
     repositories {
         mavenCentral()
         jcenter()
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
-//        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
         maven { url 'https://plugins.gradle.org/m2/' }
     }
 }