Upgrade kotlin to 1.4.30 and gradle to 6.8

Author: Elena Lepilkina

README.md

@@ -16,7 +16,7 @@ the hoods to run benchmarks on JVM.
 
 Gradle 6.0 or newer
 
-Kotlin 1.4.0 or newer
+Kotlin 1.4.30 or newer
 
 # Gradle plugin
 

examples/kotlin-kts/build.gradle.kts

@@ -21,7 +21,6 @@ configure<AllOpenExtension> {
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
     implementation(project(":kotlinx.benchmark.runtime"))
 }
 

examples/kotlin-multiplatform/build.gradle

@@ -41,7 +41,6 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation 'org.jetbrains.kotlin:kotlin-stdlib-common'
                 implementation project(":kotlinx.benchmark.runtime")
             }
         }
@@ -51,22 +50,14 @@ kotlin {
                 implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
             }
         }
-        jvmMain {
-            dependencies {
-                implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
-            }
-        }
+        jvmMain {}
         jvmTest {
             dependencies {
                 implementation 'org.jetbrains.kotlin:kotlin-test'
                 implementation 'org.jetbrains.kotlin:kotlin-test-junit'
             }
         }
-        jsMain {
-            dependencies {
-                implementation 'org.jetbrains.kotlin:kotlin-stdlib-js'
-            }
-        }
+        jsMain {}
         jsTest {
             dependencies {
                 implementation 'org.jetbrains.kotlin:kotlin-test-js'

examples/kotlin/build.gradle

@@ -33,7 +33,6 @@ compileTestKotlin {
 // Propagate dependencies from main sourceSet
 // You can add "+ sourceSets.test.output" to include test output as well
 dependencies {
-    api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
     implementation(project(":kotlinx.benchmark.runtime"))
     benchmarksCompile sourceSets.main.output + sourceSets.main.runtimeClasspath 
 }

gradle.properties

@@ -3,7 +3,7 @@ group = org.jetbrains.kotlinx
 version = 0.2.0
 
 kotlin.code.style=official
-kotlin_version=1.4.0
+kotlin_version=1.4.30
 jmhVersion=1.21
 junit_version=4.12
 

gradle/shared.gradle

@@ -13,9 +13,6 @@ compileTestKotlin {
 
 dependencies {
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_version
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk7', version: kotlin_version
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
 
     testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_version
     testCompile group: 'junit', name: 'junit', version: junit_version

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip

plugin/build.gradle

@@ -65,9 +65,6 @@ sourceSets {
 
 dependencies {
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_version
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk7', version: kotlin_version
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version
 
     compile 'com.squareup:kotlinpoet:1.3.0'
     compile "org.openjdk.jmh:jmh-core:$jmhVersion"

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.4.0
+kotlin_version=1.4.30
 jmhVersion=1.21
 junit_version=4.12
 infra_version=0.2.0-dev-55

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

@@ -67,6 +67,8 @@ private fun Project.createNativeBenchmarkCompileTask(target: NativeBenchmarkTarg
     benchmarkCompilation.apply {
         val sourceSet = kotlinSourceSets.single()
         sourceSet.resources.setSrcDirs(files())
+        // TODO: check if there are other ways to set compiler options.
+        this.kotlinOptions.freeCompilerArgs = compilation.kotlinOptions.freeCompilerArgs
         sourceSet.kotlin.setSrcDirs(files("$benchmarkBuildDir/sources"))
         sourceSet.dependencies {
             implementation(compilation.compileDependencyFiles)
@@ -79,15 +81,12 @@ private fun Project.createNativeBenchmarkCompileTask(target: NativeBenchmarkTarg
             // The release build type is already optimized and non-debuggable.
             executable(benchmarkCompilation.name, listOf(RELEASE)) {
                 this.compilation = benchmarkCompilation
+                this.outputDirectory = file("$benchmarkBuildDir/classes")
                 // A link task's name is linkReleaseExecutable<Target>.
                 linkTask.apply {
                     group = BenchmarksPlugin.BENCHMARKS_TASK_GROUP
                     description = "Compile Native benchmark source files for '${compilationTarget.name}'"
                     dependsOn(generateSourceTaskName(target))
-
-                    // It's impossible to change output directory using the binaries DSL.
-                    // See https://youtrack.jetbrains.com/issue/KT-29395
-                    destinationDir = file("$benchmarkBuildDir/classes")
                 }
                 linkTask.onlyIf { compilation.compileKotlinTask.enabled }
                 tasks.getByName(BenchmarksPlugin.ASSEMBLE_BENCHMARKS_TASKNAME).dependsOn(linkTask)