From 3b53d8694ff9e5a3532f5eff893a258b5a73ec21 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Mon, 11 Apr 2022 20:41:19 +0300
Subject: [PATCH] [K/N][build] Fix build version property usage

---
 kotlin-native/performance/buildSrc/settings.gradle.kts        | 3 ++-
 kotlin-native/performance/gradle.properties                   | 4 +---
 .../tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts     | 4 ++--
 .../tools/performance-server/buildSrc/settings.gradle.kts     | 3 ++-
 .../tools/performance-server/ui/buildSrc/settings.gradle.kts  | 3 ++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kotlin-native/performance/buildSrc/settings.gradle.kts b/kotlin-native/performance/buildSrc/settings.gradle.kts
index 8f1a17762ff..11b1beb9bbc 100644
--- a/kotlin-native/performance/buildSrc/settings.gradle.kts
+++ b/kotlin-native/performance/buildSrc/settings.gradle.kts
@@ -13,8 +13,9 @@ buildscript {
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
         mavenCentral()
     }
+    val buildGradlePluginVersion = extra["kotlin.build.gradlePlugin.version"]
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${extra["kotlin.build.gradlePlugin.version"]}")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion")
     }
 }
 
diff --git a/kotlin-native/performance/gradle.properties b/kotlin-native/performance/gradle.properties
index 43506877f51..ed1877a4ab1 100644
--- a/kotlin-native/performance/gradle.properties
+++ b/kotlin-native/performance/gradle.properties
@@ -19,6 +19,4 @@ externalReports = coroutinesReport.txt
 externalBenchmarksReport = externalReport.json
 
 # Avoid building platform libraries by the MPP plugin.
-kotlin.native.distribution.type=prebuilt
-
-kotlin.build.gradlePlugin.version=0.0.38
\ No newline at end of file
+kotlin.native.distribution.type=prebuilt
\ No newline at end of file
diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
index 761fce1f5d5..6762ff93f7e 100644
--- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
@@ -1,7 +1,6 @@
 pluginManagement {
     repositories {
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
-        jcenter()
         mavenCentral()
         gradlePluginPortal()
     }
@@ -12,7 +11,8 @@ buildscript {
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
         mavenCentral()
     }
+    val buildGradlePluginVersion = extra["kotlin.build.gradlePlugin.version"]
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${extra["kotlin.build.gradlePlugin.version"]}")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion")
     }
 }
diff --git a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
index 761fce1f5d5..d2779da5bc0 100644
--- a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
@@ -12,7 +12,8 @@ buildscript {
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
         mavenCentral()
     }
+    val buildGradlePluginVersion = extra["kotlin.build.gradlePlugin.version"]
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${extra["kotlin.build.gradlePlugin.version"]}")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion")
     }
 }
diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
index c482d15acc5..243849f4b98 100644
--- a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
@@ -21,7 +21,8 @@ buildscript {
             }
         }
     }
+    val buildGradlePluginVersion = extra["kotlin.build.gradlePlugin.version"]
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${extra["kotlin.build.gradlePlugin.version"]}")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion")
     }
 }