From 8d303af3954adeec323677fbd40acc79cfd3aceb Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Fri, 13 Dec 2019 18:47:12 +0300
Subject: [PATCH] Build: Add build scan server url setting

---
 buildSrc/build.gradle.kts                        |  4 ++--
 buildSrc/settings.gradle                         |  2 +-
 .../kotlin-build-gradle-plugin/build.gradle.kts  |  2 +-
 .../src/BuildProperties.kt                       |  2 ++
 settings.gradle                                  | 16 +++++++++++-----
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 741be217b7b..f37bddd89ce 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.5")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.6")
         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.5")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.6")
 
     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 46c49875c9f..a66bbb7bcd4 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.5")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.6")
     }
 }
 
diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
index 4d874fbf974..07ead68e19b 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.5"
+version = "0.0.6"
 
 repositories {
     mavenCentral()
diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
index d98e4a9f62a..6f206313333 100644
--- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
+++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
@@ -90,6 +90,8 @@ class KotlinBuildProperties(
     val pushToBuildCache: Boolean = getBoolean("kotlin.build.cache.push", isTeamcityBuild)
 
     val localBuildCacheEnabled: Boolean = getBoolean("kotlin.build.cache.local.enabled", !isTeamcityBuild)
+
+    val buildScanServer: String? = get("kotlin.build.scan.url") as String?
 }
 
 private const val extensionName = "kotlinBuildProperties"
diff --git a/settings.gradle b/settings.gradle
index e9c15efdfd0..1bfac674cc6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,7 +31,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.5")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.6")
     }
 }
 
@@ -39,15 +39,21 @@ plugins {
     id "com.gradle.enterprise" version "3.0"
 }
 
+def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
+
 gradleEnterprise {
     buildScan {
-        setTermsOfServiceUrl("https://gradle.com/terms-of-service")
-        setTermsOfServiceAgree("yes")
+        if (buildProperties.buildScanServer != null) {
+            server = buildProperties.buildScanServer
+            allowUntrustedServer = true
+            publishAlways()
+        } else {
+            setTermsOfServiceUrl("https://gradle.com/terms-of-service")
+            setTermsOfServiceAgree("yes")
+        }
     }
 }
 
-def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
-
 BuildCacheKt.setupBuildCache(settings)
 
 // modules