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

Build: Extract build cache setup to kotlin-build-gradle-plugin

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2019-12-04 21:23:26 +03:00
parent 68ce5dbd90
commit 724884513e
5 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/build.gradle.kts
+2 -2
View File
@@ -22,7 +22,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.4")
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.5")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$buildSrcKotlinVersion")
classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:$buildSrcKotlinVersion")
}
@@ -94,7 +94,7 @@ repositories {
dependencies {
implementation(kotlin("stdlib", embeddedKotlinVersion))
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.4")
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.5")
implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
implementation("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
buildSrc/settings.gradle
+2 -16
View File
@@ -20,27 +20,13 @@ buildscript {
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.4")
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.5")
}
}
def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
logger.info("buildCacheUrl=${buildProperties.buildCacheUrl}")
logger.info("pushToBuildCache=${buildProperties.pushToBuildCache}")
buildCache {
local {
enabled = buildProperties.localBuildCacheEnabled
}
if (buildProperties.buildCacheUrl != null) {
remote(HttpBuildCache) {
url = buildProperties.buildCacheUrl
push = buildProperties.pushToBuildCache
}
}
}
BuildCacheKt.setupBuildCache(settings)
include "prepare-deps"
dependencies/kotlin-build-gradle-plugin/build.gradle.kts
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
}
group = "org.jetbrains.kotlin"
version = "0.0.4"
version = "0.0.5"
repositories {
mavenCentral()
dependencies/kotlin-build-gradle-plugin/src/BuildCache.kt
Vendored
+19
View File
@@ -0,0 +1,19 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
import org.gradle.api.initialization.Settings
import org.gradle.caching.http.HttpBuildCache
import java.net.URI
fun Settings.setupBuildCache() {
buildCache.local.isEnabled = kotlinBuildProperties.localBuildCacheEnabled
kotlinBuildProperties.buildCacheUrl?.let { remoteCacheUrl ->
buildCache.remote(HttpBuildCache::class.java) { remoteCache ->
remoteCache.url = URI(remoteCacheUrl)
remoteCache.isPush = kotlinBuildProperties.pushToBuildCache
}
}
}
settings.gradle
+2 -16
View File
@@ -31,7 +31,7 @@ buildscript {
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.4")
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.5")
}
}
@@ -48,21 +48,7 @@ gradleEnterprise {
def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
logger.info("buildCacheUrl=${buildProperties.buildCacheUrl}")
logger.info("pushToBuildCache=${buildProperties.pushToBuildCache}")
buildCache {
local {
enabled = buildProperties.localBuildCacheEnabled
}
if (buildProperties.buildCacheUrl != null) {
remote(HttpBuildCache) {
url = buildProperties.buildCacheUrl
push = buildProperties.pushToBuildCache
}
}
}
BuildCacheKt.setupBuildCache(settings)
// modules
include ":kotlin-build-common",