diff --git a/build.gradle.kts b/build.gradle.kts index 401aceef317..185c1c1e466 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,7 @@ buildscript { dependencies { bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion)) - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") classpath(kotlin("gradle-plugin", bootstrapKotlinVersion)) classpath(kotlin("serialization", bootstrapKotlinVersion)) } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5080301182c..3dff4c68f0f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -22,7 +22,6 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}") } @@ -149,7 +148,7 @@ java { dependencies { implementation(kotlin("stdlib", embeddedKotlinVersion)) implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") - implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") implementation("com.gradle.publish:plugin-publish-plugin:0.20.0") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10") diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index b43646f359d..25bbac9e8c2 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -6,3 +6,5 @@ cacheRedirectorEnabled=true #buildSrc.kotlin.repo=https://jcenter.bintray.com #buildSrc.kotlin.version=1.1.50 + +kotlin.build.gradlePlugin.version=0.0.38 diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index 7e92a184469..778523384b1 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -20,9 +20,10 @@ buildscript { } mavenCentral() } + def buildGradlePluginVersion = ext["kotlin.build.gradlePlugin.version"] dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion") } } -include "prepare-deps" +include "prepare-deps" \ No newline at end of file diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt index a8553de51d6..41a56a0e90e 100644 --- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt +++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt @@ -66,6 +66,8 @@ class KotlinBuildProperties( val buildCachePassword: String? = getOrNull("kotlin.build.cache.password") as String? + val buildGradlePluginVersion: String? = getOrNull("kotlin.build.gradlePlugin.version") as String? + val kotlinBootstrapVersion: String? = getOrNull("bootstrap.kotlin.default.version") as String? val defaultSnapshotVersion: String? = getOrNull("defaultSnapshotVersion") as String? diff --git a/gradle.properties b/gradle.properties index 8cd0c8b437d..b80df009a26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,8 @@ systemProp.org.gradle.internal.http.socketTimeout=90000 cacheRedirectorEnabled=true defaultSnapshotVersion=1.7.255-SNAPSHOT +kotlin.build.gradlePlugin.version=0.0.38 + #maven.repository.mirror=http://repository.jetbrains.com/remote-repos/ #bootstrap.kotlin.repo=https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap #bootstrap.kotlin.version=1.1.50-dev-1451 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a09f3a2ae32..99dbeef2909 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -6573,6 +6573,11 @@ + + + + + diff --git a/kotlin-native/performance/build.gradle b/kotlin-native/performance/build.gradle index 930df6cdd91..cabbdac69ba 100644 --- a/kotlin-native/performance/build.gradle +++ b/kotlin-native/performance/build.gradle @@ -31,7 +31,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") } } diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts index 9346971bbe4..9d7ece82abe 100644 --- a/kotlin-native/performance/buildSrc/build.gradle.kts +++ b/kotlin-native/performance/buildSrc/build.gradle.kts @@ -30,7 +30,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") } } @@ -81,7 +81,7 @@ tasks.withType().configureEach { dependencies { - implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}") api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}") diff --git a/kotlin-native/performance/buildSrc/gradle.properties b/kotlin-native/performance/buildSrc/gradle.properties new file mode 100644 index 00000000000..75799314021 --- /dev/null +++ b/kotlin-native/performance/buildSrc/gradle.properties @@ -0,0 +1 @@ +kotlin.build.gradlePlugin.version=0.0.38 \ No newline at end of file diff --git a/kotlin-native/performance/buildSrc/settings.gradle.kts b/kotlin-native/performance/buildSrc/settings.gradle.kts index 9dc1f9ba50e..8f1a17762ff 100644 --- a/kotlin-native/performance/buildSrc/settings.gradle.kts +++ b/kotlin-native/performance/buildSrc/settings.gradle.kts @@ -14,7 +14,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${extra["kotlin.build.gradlePlugin.version"]}") } } diff --git a/kotlin-native/performance/gradle.properties b/kotlin-native/performance/gradle.properties index ed1877a4ab1..43506877f51 100644 --- a/kotlin-native/performance/gradle.properties +++ b/kotlin-native/performance/gradle.properties @@ -19,4 +19,6 @@ externalReports = coroutinesReport.txt externalBenchmarksReport = externalReport.json # Avoid building platform libraries by the MPP plugin. -kotlin.native.distribution.type=prebuilt \ No newline at end of file +kotlin.native.distribution.type=prebuilt + +kotlin.build.gradlePlugin.version=0.0.38 \ No newline at end of file diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts index 824f1395906..c473279356f 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts @@ -32,7 +32,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") } } @@ -82,7 +82,7 @@ tasks.withType().configureEach { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}") api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}") diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/gradle.properties b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/gradle.properties new file mode 100644 index 00000000000..75799314021 --- /dev/null +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/gradle.properties @@ -0,0 +1 @@ +kotlin.build.gradlePlugin.version=0.0.38 \ 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 0a67f983b25..761fce1f5d5 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts @@ -13,6 +13,6 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${extra["kotlin.build.gradlePlugin.version"]}") } } diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts index 6f1be317e57..49920dd6566 100644 --- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts @@ -30,7 +30,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") } } @@ -80,7 +80,7 @@ tasks.withType().configureEach { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}") api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}") diff --git a/kotlin-native/tools/performance-server/buildSrc/gradle.properties b/kotlin-native/tools/performance-server/buildSrc/gradle.properties new file mode 100644 index 00000000000..75799314021 --- /dev/null +++ b/kotlin-native/tools/performance-server/buildSrc/gradle.properties @@ -0,0 +1 @@ +kotlin.build.gradlePlugin.version=0.0.38 \ No newline at end of file diff --git a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts index 0a67f983b25..761fce1f5d5 100644 --- a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts +++ b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts @@ -13,6 +13,6 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${extra["kotlin.build.gradlePlugin.version"]}") } } diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts index 48a160099a8..963aa50e66d 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts @@ -29,7 +29,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") } } @@ -78,7 +78,7 @@ tasks.withType().configureEach { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}") api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}") api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}") diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/gradle.properties b/kotlin-native/tools/performance-server/ui/buildSrc/gradle.properties new file mode 100644 index 00000000000..75799314021 --- /dev/null +++ b/kotlin-native/tools/performance-server/ui/buildSrc/gradle.properties @@ -0,0 +1 @@ +kotlin.build.gradlePlugin.version=0.0.38 \ No newline at end of file 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 8ce0c378015..c482d15acc5 100644 --- a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts +++ b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts @@ -22,6 +22,6 @@ buildscript { } } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${extra["kotlin.build.gradlePlugin.version"]}") } } diff --git a/settings.gradle b/settings.gradle index 0b1b0be3363..6b553806ab9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,8 +27,9 @@ buildscript { } mavenCentral() } + def buildGradlePluginVersion = ext["kotlin.build.gradlePlugin.version"] dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${buildGradlePluginVersion}") } }