Build: Add localBuildCacheDirectory property to KotlinBuildProperties
This commit is contained in:
@@ -28,6 +28,7 @@ buildscript {
|
|||||||
dependencies {
|
dependencies {
|
||||||
bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
|
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("com.gradle.publish:plugin-publish-plugin:0.9.7")
|
||||||
classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
|
classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
|
||||||
classpath("net.sf.proguard:proguard-gradle:6.1.0")
|
classpath("net.sf.proguard:proguard-gradle:6.1.0")
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
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-gradle-plugin:$buildSrcKotlinVersion")
|
||||||
classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:$buildSrcKotlinVersion")
|
classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:$buildSrcKotlinVersion")
|
||||||
}
|
}
|
||||||
@@ -90,7 +90,7 @@ repositories {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(kotlin("stdlib", embeddedKotlinVersion))
|
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:${property("versions.native-platform")}")
|
||||||
implementation("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
|
implementation("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8")
|
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.12")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "org.jetbrains.kotlin"
|
group = "org.jetbrains.kotlin"
|
||||||
version = "0.0.8"
|
version = "0.0.12"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import java.net.URI
|
|||||||
|
|
||||||
fun Settings.setupBuildCache() {
|
fun Settings.setupBuildCache() {
|
||||||
buildCache.local.isEnabled = kotlinBuildProperties.localBuildCacheEnabled
|
buildCache.local.isEnabled = kotlinBuildProperties.localBuildCacheEnabled
|
||||||
|
kotlinBuildProperties.localBuildCacheDirectory?.let { buildCache.local.directory = it }
|
||||||
kotlinBuildProperties.buildCacheUrl?.let { remoteCacheUrl ->
|
kotlinBuildProperties.buildCacheUrl?.let { remoteCacheUrl ->
|
||||||
buildCache.remote(HttpBuildCache::class.java) { remoteCache ->
|
buildCache.remote(HttpBuildCache::class.java) { remoteCache ->
|
||||||
remoteCache.url = URI(remoteCacheUrl)
|
remoteCache.url = URI(remoteCacheUrl)
|
||||||
|
|||||||
@@ -89,6 +89,8 @@ class KotlinBuildProperties(
|
|||||||
|
|
||||||
val localBuildCacheEnabled: Boolean = getBoolean("kotlin.build.cache.local.enabled", !isTeamcityBuild)
|
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 buildScanServer: String? = get("kotlin.build.scan.url") as String?
|
||||||
|
|
||||||
val buildCacheUser: String? = get("kotlin.build.cache.user") as String?
|
val buildCacheUser: String? = get("kotlin.build.cache.user") as String?
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8")
|
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.12")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user