azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Advance bootstrap to 1.4.0-dev-5087

Browse Source 
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).
This commit is contained in:
Ilya Gorbunov
2020-03-22 06:47:42 +03:00
parent 6b11decf52
commit 4a8dbcccee
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/build.gradle.kts
+2 -1
View File
@@ -5,7 +5,8 @@ buildscript {
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
extra["defaultSnapshotVersion"] = kotlinBuildProperties.defaultSnapshotVersion 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 { repositories {
if (cacheRedirectorEnabled) { if (cacheRedirectorEnabled) {
gradle.properties
+1 -1
View File
@@ -8,7 +8,7 @@ kotlin.compiler.newInferenceEnabled=true
#maven.repository.mirror=http://repository.jetbrains.com/remote-repos/ #maven.repository.mirror=http://repository.jetbrains.com/remote-repos/
#bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev #bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
#bootstrap.kotlin.version=1.1.50-dev-1451 #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 #signingRequired=true