Reverts commit 13afb2e4 (buildSrc bootstrap version)

buildSrc/build.gradle.kts

@@ -1,10 +1,10 @@
 extra["versions.native-platform"] = "0.14"
 
 buildscript {
-
     val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
 
-    kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled))
+    val buildSrcKotlinVersion: String by extra(findProperty("buildSrc.kotlin.version")?.toString() ?: embeddedKotlinVersion)
+    val buildSrcKotlinRepo: String? by extra(findProperty("buildSrc.kotlin.repo") as String?)
 
     repositories {
         if (cacheRedirectorEnabled) {
@@ -15,21 +15,21 @@ buildscript {
             maven("https://kotlin.bintray.com/kotlin-dependencies")
         }
 
-        project.bootstrapKotlinRepo?.let {
+        buildSrcKotlinRepo?.let {
             maven(url = it)
         }
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.10")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
-        classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$buildSrcKotlinVersion")
+        classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:$buildSrcKotlinVersion")
     }
 }
 
 val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
 
-logger.info("buildSrcKotlinVersion: " + extra["bootstrapKotlinVersion"])
+logger.info("buildSrcKotlinVersion: " + extra["buildSrcKotlinVersion"])
 logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
 logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
 
@@ -83,14 +83,14 @@ repositories {
     maven("https://kotlin.bintray.com/kotlin-dependencies")
     gradlePluginPortal()
 
-    extra["bootstrapKotlinRepo"]?.let {
+    extra["buildSrcKotlinRepo"]?.let {
         maven(url = it)
     }
 }
 
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.10")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8")
 
     implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
     implementation("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")

buildSrc/settings.gradle

@@ -20,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.10")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.8")
     }
 }
 

buildSrc/src/main/kotlin/Bootstrap.kt

@@ -0,0 +1,114 @@
+@file:Suppress("unused") // usages in build scripts are not tracked properly
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.*
+import java.net.URI
+
+
+var Project.bootstrapKotlinVersion: String
+    get() = this.property("bootstrapKotlinVersion") as String
+    private set(value) {
+        this.extra["bootstrapKotlinVersion"] = value
+    }
+
+var Project.bootstrapKotlinRepo: String?
+    get() = this.property("bootstrapKotlinRepo") as String?
+    private set(value) {
+        this.extra["bootstrapKotlinRepo"] = value
+    }
+
+val Project.internalKotlinRepo: String?
+    get() = "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:$bootstrapKotlinVersion," +
+            "branch:default:any/artifacts/content/internal/repo"
+
+fun Project.kotlinBootstrapFrom(defaultSource: BootstrapOption) {
+    val customVersion = project.findProperty("bootstrap.kotlin.version") as String?
+    val customRepo = project.findProperty("bootstrap.kotlin.repo") as String?
+    val teamCityVersion = project.findProperty("bootstrap.teamcity.kotlin.version") as String?
+    val teamCityBuild = project.findProperty("bootstrap.teamcity.build.number") as String?
+    val teamCityProject = project.findProperty("bootstrap.teamcity.project") as String?
+
+    val bootstrapSource = when {
+        project.hasProperty("bootstrap.local") -> BootstrapOption.Local(
+            project.findProperty("bootstrap.local.version") as String?,
+            project.findProperty("bootstrap.local.path") as String?
+        )
+        teamCityVersion != null -> BootstrapOption.TeamCity(
+            teamCityVersion,
+            teamCityBuild,
+            projectExtId = teamCityProject,
+            onlySuccessBootstrap = false
+        )
+        customVersion != null -> BootstrapOption.Custom(kotlinVersion = customVersion, repo = customRepo)
+        else -> defaultSource
+    }
+
+    bootstrapSource.applyToProject(project)
+    project.logger.lifecycle("Using kotlin bootstrap version $bootstrapKotlinVersion from repo $bootstrapKotlinRepo")
+}
+
+sealed class BootstrapOption {
+    abstract fun applyToProject(project: Project)
+
+    /** Manual repository and version specification.
+     *
+     *  If [repo] is not specified the default buildscript and project repositories are used
+     */
+    open class Custom(val kotlinVersion: String, val repo: String?, val cacheRedirector: Boolean = false) : BootstrapOption() {
+        override fun applyToProject(project: Project) {
+            project.bootstrapKotlinVersion = kotlinVersion
+            project.bootstrapKotlinRepo = if (cacheRedirector)
+                repo?.let { URI(it) }?.let { "https://cache-redirector.jetbrains.com/${it.host}/${it.path}" }
+            else
+                repo
+        }
+    }
+
+    /** Get bootstrap from kotlin-dev bintray repo */
+    class BintrayDev(kotlinVersion: String, cacheRedirector: Boolean = false) :
+        Custom(kotlinVersion, "https://dl.bintray.com/kotlin/kotlin-dev", cacheRedirector)
+
+    /** Get bootstrap from kotlin-bootstrap bintray repo, where bootstraps are published */
+    class BintrayBootstrap(kotlinVersion: String, cacheRedirector: Boolean = false) :
+        Custom(kotlinVersion, "https://dl.bintray.com/kotlin/kotlin-bootstrap", cacheRedirector)
+
+    /** Get bootstrap from teamcity maven artifacts of the specified build configuration
+     *
+     * [kotlinVersion] the version of maven artifacts
+     * [buildNumber] build number of a teamcity build, by default the same as [kotlinVersion],
+     * [projectExtId] extId of a teamcity build configuration, by default "Kotlin_dev_Compiler",
+     * [onlySuccessBootstrap] allow artifacts only from success builds of the default branch tagged with 'bootstrap' tag
+     */
+    class TeamCity(
+        val kotlinVersion: String,
+        val buildNumber: String? = null,
+        val projectExtId: String? = null,
+        val onlySuccessBootstrap: Boolean = true,
+        val teamcityUrl: String = "https://teamcity.jetbrains.com"
+    ) : BootstrapOption() {
+        override fun applyToProject(project: Project) {
+            val query = if (onlySuccessBootstrap) "status:SUCCESS,tag:bootstrap,pinned:true" else "branch:default:any"
+            project.bootstrapKotlinRepo = "$teamcityUrl/guestAuth/app/rest/builds/buildType:(id:${projectExtId
+                ?: "Kotlin_dev_Compiler"}),number:${buildNumber ?: kotlinVersion},$query/artifacts/content/maven/"
+            project.bootstrapKotlinVersion = kotlinVersion
+        }
+    }
+
+    /**
+     * Use previously published local artifacts from the build/repo maven repository
+     *
+     * [kotlinVersion] version of artifacts, by default the snapshot version of project is used
+     * [localPath] the path to local repository, if specified it is resolved with respect or project dir
+     */
+    class Local(val kotlinVersion: String? = null, val localPath: String? = null) : BootstrapOption() {
+        override fun applyToProject(project: Project) {
+            val repoPath = if (localPath != null)
+                project.projectDir.resolve(localPath).canonicalFile
+            else
+                project.buildDir.resolve("repo")
+
+            project.bootstrapKotlinRepo = repoPath.toURI().toString()
+            project.bootstrapKotlinVersion = kotlinVersion ?: project.property("defaultSnapshotVersion") as String
+        }
+    }
+}

buildSrc/src/main/kotlin/dependencies.kt

@@ -2,12 +2,14 @@
 
 // usages in build scripts are not tracked properly
 
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
+import org.gradle.api.tasks.AbstractCopyTask
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.project
 import java.io.File