diff --git a/build.gradle.kts b/build.gradle.kts index c35668853b5..abfd968dce9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,6 +28,7 @@ buildscript { dependencies { bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion)) + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.12") classpath("com.gradle.publish:plugin-publish-plugin:0.9.7") classpath(kotlin("gradle-plugin", bootstrapKotlinVersion)) classpath("net.sf.proguard:proguard-gradle:6.1.0") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6b442e7626c..36d6cfdc41c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -21,7 +21,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.12") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$buildSrcKotlinVersion") classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:$buildSrcKotlinVersion") } @@ -90,7 +90,7 @@ repositories { dependencies { implementation(kotlin("stdlib", embeddedKotlinVersion)) - implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8") + implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.12") implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}") implementation("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}") diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index 2da8b73f47c..f8b95076931 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -20,7 +20,7 @@ buildscript { } } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.12") } } diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts index dc3d7442b2d..cb81f36660f 100644 --- a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts +++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "org.jetbrains.kotlin" -version = "0.0.8" +version = "0.0.12" repositories { mavenCentral() diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildCache.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildCache.kt index c0bbf376c79..adc672dcbfc 100644 --- a/dependencies/kotlin-build-gradle-plugin/src/BuildCache.kt +++ b/dependencies/kotlin-build-gradle-plugin/src/BuildCache.kt @@ -10,6 +10,7 @@ import java.net.URI fun Settings.setupBuildCache() { buildCache.local.isEnabled = kotlinBuildProperties.localBuildCacheEnabled + kotlinBuildProperties.localBuildCacheDirectory?.let { buildCache.local.directory = it } kotlinBuildProperties.buildCacheUrl?.let { remoteCacheUrl -> buildCache.remote(HttpBuildCache::class.java) { remoteCache -> remoteCache.url = URI(remoteCacheUrl) diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt index 0fae1aa2f6b..a53f9f036f0 100644 --- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt +++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt @@ -89,6 +89,8 @@ class KotlinBuildProperties( val localBuildCacheEnabled: Boolean = getBoolean("kotlin.build.cache.local.enabled", !isTeamcityBuild) + val localBuildCacheDirectory: String? = get("kotlin.build.cache.local.directory") as String? + val buildScanServer: String? = get("kotlin.build.scan.url") as String? val buildCacheUser: String? = get("kotlin.build.cache.user") as String? diff --git a/settings.gradle b/settings.gradle index ffbeb7b936f..db5cbf442a0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,7 +27,7 @@ buildscript { } } dependencies { - classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8") + classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.12") } }