Infer internal artifacts bootstrap repository
This allows taking these artifacts from buildserver if the bootstrap itself is taken from there.
This commit is contained in:
+1
-1
@@ -359,7 +359,7 @@ allprojects {
|
|||||||
maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
|
maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
|
||||||
maven("https://dl.google.com/dl/android/maven2")
|
maven("https://dl.google.com/dl/android/maven2")
|
||||||
bootstrapKotlinRepo?.let(::maven)
|
bootstrapKotlinRepo?.let(::maven)
|
||||||
internalKotlinRepo?.let(::maven)
|
internalBootstrapRepo?.let(::maven)
|
||||||
}
|
}
|
||||||
|
|
||||||
configureJvmProject(javaHome!!, jvmTarget!!)
|
configureJvmProject(javaHome!!, jvmTarget!!)
|
||||||
|
|||||||
@@ -22,6 +22,15 @@ val Project.intellijRepo get() =
|
|||||||
else -> "https://www.jetbrains.com/intellij-repository/releases"
|
else -> "https://www.jetbrains.com/intellij-repository/releases"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val Project.internalBootstrapRepo: String? get() =
|
||||||
|
when {
|
||||||
|
bootstrapKotlinRepo?.startsWith("https://buildserver.labs.intellij.net") == true ->
|
||||||
|
bootstrapKotlinRepo!!.replace("artifacts/content/maven", "artifacts/content/internal/repo")
|
||||||
|
else -> "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:$bootstrapKotlinVersion," +
|
||||||
|
"branch:default:any/artifacts/content/internal/repo/"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
fun Project.commonDep(coord: String): String {
|
fun Project.commonDep(coord: String): String {
|
||||||
val parts = coord.split(':')
|
val parts = coord.split(':')
|
||||||
return when (parts.size) {
|
return when (parts.size) {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ var Project.bootstrapKotlinRepo: String?
|
|||||||
extensions.extraProperties.set("bootstrapKotlinRepo", value)
|
extensions.extraProperties.set("bootstrapKotlinRepo", value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated("Obsolete, use internalBootstrapRepo instead.")
|
||||||
val Project.internalKotlinRepo: String?
|
val Project.internalKotlinRepo: String?
|
||||||
get() = "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:$bootstrapKotlinVersion," +
|
get() = "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:$bootstrapKotlinVersion," +
|
||||||
"branch:default:any/artifacts/content/internal/repo"
|
"branch:default:any/artifacts/content/internal/repo"
|
||||||
|
|||||||
Reference in New Issue
Block a user