[build] version of kotlin native stored in resouces

build.gradle.kts

@@ -115,6 +115,10 @@ extra["ideaUltimateSandboxDir"] = project.file(ideaUltimateSandboxDir)
 extra["ideaPluginDir"] = project.file(ideaPluginDir)
 extra["ideaUltimatePluginDir"] = project.file(ideaUltimatePluginDir)
 extra["isSonatypeRelease"] = false
+val kotlinNativeVersionObject = project.kotlinNativeVersionValue()
+subprojects {
+    extra["kotlinNativeVersion"] = kotlinNativeVersionObject
+}
 
 // Work-around necessary to avoid setting null javaHome. Will be removed after support of lazy task configuration
 val jdkNotFoundConst = "JDK NOT FOUND"

buildSrc/build.gradle.kts

@@ -96,7 +96,10 @@ repositories {
     }
 }
 
-val generateCompilerVersion by tasks.registering(VersionGenerator::class) {}
+val generateCompilerVersion by tasks.registering(VersionGenerator::class) {
+    kotlinNativeVersionInResources=true
+    defaultVersionFileLocation()
+}
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     dependsOn(generateCompilerVersion)
 }

buildSrc/src/kotlin-native-binary-version/kotlin/org/jetbrains/kotlin/konan/kotlin-native-version.kt

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2021 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
+import java.io.*
+
+val VERSION_PATH = "/META-INF/kotlin-native.compiler.version"
+val CompilerVersion.Companion.CURRENT: CompilerVersion
+    get() {
+        return InputStreamReader(this::class.java.getResourceAsStream(VERSION_PATH)).use {
+            it.readLines().single().parseCompilerVersion()
+        }
+    }
+
+val currentCompilerVersion = CompilerVersion.CURRENT

kotlin-native/Interop/StubGenerator/build.gradle

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

kotlin-native/backend.native/build.gradle

@@ -33,11 +33,11 @@ sourceSets {
             srcDir 'compiler/ir/backend.native/src/'
             srcDir '../shared/src/main/kotlin'
             srcDir '../shared/src/library/kotlin'
-            use(VersionGeneratorKt) {
-                srcDir(project.konanVersionGeneratedSrc())
-            }
+            srcDir(VersionGeneratorKt.kotlinNativeVersionSrc(project))
         }
         resources.srcDir 'compiler/ir/backend.native/resources/'
+        /* PATH to META-INF */
+        resources.srcDir VersionGeneratorKt.kotlinNativeVersionResourceFile(project).parentFile.parent
     }
     cli_bc {
         java.srcDir 'cli.bc/src'

kotlin-native/build.gradle

@@ -95,7 +95,7 @@ ext {
     kotlinScriptRuntimeModule= project(":kotlin-script-runtime")
     kotlinUtilKliMetadatabModule= project(":kotlin-util-klib-metadata")
 
-    konanVersionFull = CompilerVersionGeneratedKt.getCurrentCompilerVersion()
+    konanVersionFull = ext.kotlinNativeVersion
     gradlePluginVersion = konanVersionFull
 }
 
@@ -765,7 +765,7 @@ task clean(type: Delete) {
 
 task pusher(type: KotlinBuildPusher){
     kotlinVersion = project.kotlinVersion
-    konanVersion = CompilerVersionGeneratedKt.getCurrentCompilerVersion()
+    konanVersion = project.ext.kotlinNativeVersion
     buildServer = "buildserver.labs.intellij.net"
     compilerConfigurationId = System.getenv("TEAMCITY_COMPILER_ID") ?: "Kotlin_KotlinDev_Compiler"
     overrideConfigurationId = System.getenv("TEAMCITY_OVERRIDE_NATIVE_ID") ?: "Kotlin_KotlinDev_DeployMavenArtifacts_OverrideNative"

kotlin-native/gradle.properties

@@ -43,4 +43,5 @@ shadowVersion=5.1.0
 metadataVersion=0.0.1-dev-10
 
 # Uncomment to compile Kotlin/Native backend modules with JVM IR backend.
-# kotlin.build.useIR=true
+# kotlin.build.useIR=true
+kotlinNativeVersionInResources=true

kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanPlugin.kt

@@ -94,7 +94,7 @@ internal val Project.konanHome: String
 internal val Project.konanVersion: CompilerVersion
     get() = project.findProperty(KonanPlugin.ProjectProperty.KONAN_VERSION)
         ?.toString()?.let { CompilerVersion.fromString(it) }
-        ?: CompilerVersion.CURRENT
+        ?: project.findProperty("kotlinNativeVersion") as? CompilerVersion ?: CompilerVersion.CURRENT
 
 internal val Project.konanBuildRoot          get() = buildDir.resolve("konan")
 internal val Project.konanBinBaseDir         get() = konanBuildRoot.resolve("bin")