From 4a8dbccceef3bad2b5663a5bbdd3e22cc1dce61d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sun, 22 Mar 2020 06:47:42 +0300 Subject: [PATCH] Advance bootstrap to 1.4.0-dev-5087 Temporary fix kotlin gradle plugin version in buildsrc at 1.4.0-dev-1818, otherwise it causes problems in main buildscripts, when compiled with -dev-5087 (KT-37235). --- buildSrc/build.gradle.kts | 3 ++- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6ccfc61f46f..d2d3c83ba85 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -5,7 +5,8 @@ buildscript { val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true extra["defaultSnapshotVersion"] = kotlinBuildProperties.defaultSnapshotVersion - kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled)) + BootstrapOption.BintrayBootstrap("1.4.0-dev-1818", cacheRedirectorEnabled).applyToProject(project) +// kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled)) repositories { if (cacheRedirectorEnabled) { diff --git a/gradle.properties b/gradle.properties index 8544caa56b9..deb2756752b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ kotlin.compiler.newInferenceEnabled=true #maven.repository.mirror=http://repository.jetbrains.com/remote-repos/ #bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev #bootstrap.kotlin.version=1.1.50-dev-1451 -bootstrap.kotlin.default.version=1.4.0-dev-1818 +bootstrap.kotlin.default.version=1.4.0-dev-5087 #signingRequired=true