[build] switch to kotlin-build-gradle-plugin:0.0.25

build.gradle.kts

@@ -27,7 +27,7 @@ buildscript {
     dependencies {
         bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
 
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
         classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
         classpath(kotlin("serialization", bootstrapKotlinVersion))
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")

buildSrc/build.gradle.kts

@@ -24,7 +24,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
         classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}")
     }
@@ -97,10 +97,22 @@ repositories {
     }
 }
 
+val generateCompilerVersion by tasks.registering(VersionGenerator::class) {}
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    dependsOn(generateCompilerVersion)
+}
+
+tasks.clean {
+    doFirst {
+        val versionSourceDirectory = project.konanVersionGeneratedSrc()
+        if (versionSourceDirectory.exists()) {
+            versionSourceDirectory.delete()
+        }
+    }
+}
+
 sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) {
     kotlin.srcDir("src/main/kotlin")
-    kotlin.srcDir("src/generated/kotlin")
-    kotlin.srcDir("src/to_bootstrap/kotlin")
     kotlin.srcDir("../kotlin-native/shared/src/library/kotlin")
     kotlin.srcDir("../kotlin-native/shared/src/main/kotlin")
     kotlin.srcDir("../kotlin-native/build-tools/src/main/kotlin")
@@ -116,10 +128,14 @@ tasks.validatePlugins.configure {
     enabled = false
 }
 
+java {
+    disableAutoTargetJvm()
+}
+
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
     implementation("com.gradle.publish:plugin-publish-plugin:0.12.0")
 
     implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")

buildSrc/settings.gradle

@@ -20,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
     }
 }
 

buildSrc/src/generated/kotlin/org/jetbrains/kotlin/konan/CompilerVersionGenerated.kt

@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.konan
-
-internal val currentCompilerVersion: CompilerVersion =
-    CompilerVersionImpl(
-        MetaVersion.DEV, 1, 4,
-        30, -1, -1)
-
-val CompilerVersion.Companion.CURRENT: CompilerVersion
-    get() = currentCompilerVersion

gradle.properties

@@ -42,3 +42,4 @@ kotlin.stdlib.default.dependency=false
 kotlin.internal.mpp12x.deprecation.suppress=true
 kotlin.mpp.stability.nowarn=true
 kotlin.2js.nowarn=true
+kotlin.native.enabled=false

kotlin-native/Interop/StubGenerator/build.gradle

@@ -53,7 +53,9 @@ sourceSets{
         kotlin {
             srcDir("../../shared/src/library/kotlin")
             srcDir("../../shared/src/main/kotlin")
-            srcDir("../../../buildSrc/src/generated/kotlin")
+            use(VersionGeneratorKt) {
+                srcDir(project.konanVersionGeneratedSrc())
+            }
         }
     }
 }

kotlin-native/backend.native/build.gradle

@@ -32,7 +32,9 @@ sourceSets {
             srcDir 'compiler/ir/backend.native/src/'
             srcDir '../shared/src/main/kotlin'
             srcDir '../shared/src/library/kotlin'
-            srcDir '../../buildSrc/src/generated/kotlin'
+            use(VersionGeneratorKt) {
+                srcDir(project.konanVersionGeneratedSrc())
+            }
         }
         resources.srcDir 'compiler/ir/backend.native/resources/'
     }

settings.gradle

@@ -27,7 +27,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.21")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.25")
     }
 }