Fix import for JPS build of Kotlin repo
Changed link of configuration on TC for getting artifacts from "Compiler Dist (202) and Maven Artifacts" to "Kotlin / Kotlin Public / Aggregate"
This commit is contained in:
@@ -36,7 +36,7 @@ val Project.internalBootstrapRepo: String? get() =
|
|||||||
when {
|
when {
|
||||||
bootstrapKotlinRepo?.startsWith("https://buildserver.labs.intellij.net") == true ->
|
bootstrapKotlinRepo?.startsWith("https://buildserver.labs.intellij.net") == true ->
|
||||||
bootstrapKotlinRepo!!.replace("artifacts/content/maven", "artifacts/content/internal/repo")
|
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," +
|
else -> "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate),number:$bootstrapKotlinVersion," +
|
||||||
"branch:default:any/artifacts/content/internal/repo/"
|
"branch:default:any/artifacts/content/internal/repo/"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ var Project.bootstrapKotlinRepo: String?
|
|||||||
|
|
||||||
@Deprecated("Obsolete, use internalBootstrapRepo instead.")
|
@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_Aggregate),number:$bootstrapKotlinVersion," +
|
||||||
"branch:default:any/artifacts/content/internal/repo"
|
"branch:default:any/artifacts/content/internal/repo"
|
||||||
|
|
||||||
fun Project.kotlinBootstrapFrom(defaultSource: BootstrapOption) {
|
fun Project.kotlinBootstrapFrom(defaultSource: BootstrapOption) {
|
||||||
|
|||||||
+1
-1
@@ -70,7 +70,7 @@ val DEFAULT_GRADLE_PLUGIN_REPOSITORY = RepositoryDescription(
|
|||||||
fun devRepository(version: String) = RepositoryDescription(
|
fun devRepository(version: String) = RepositoryDescription(
|
||||||
"teamcity.kotlin.dev",
|
"teamcity.kotlin.dev",
|
||||||
"Teamcity Repository of Kotlin Development Builds",
|
"Teamcity Repository of Kotlin Development Builds",
|
||||||
"https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:$version,branch:(default:any)/artifacts/content/maven",
|
"https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate),number:$version,branch:(default:any)/artifacts/content/maven",
|
||||||
null,
|
null,
|
||||||
isSnapshot = false
|
isSnapshot = false
|
||||||
)
|
)
|
||||||
|
|||||||
Vendored
+1
-1
@@ -9,7 +9,7 @@ dependencies {
|
|||||||
implementation(kotlin("stdlib-jdk8"))
|
implementation(kotlin("stdlib-jdk8"))
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
maven("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven")
|
maven("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven")
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
val compileKotlin: KotlinCompile by tasks
|
val compileKotlin: KotlinCompile by tasks
|
||||||
|
|||||||
Vendored
+1
-1
@@ -9,7 +9,7 @@ dependencies {
|
|||||||
implementation(kotlin("stdlib-jdk8"))
|
implementation(kotlin("stdlib-jdk8"))
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
maven("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven")
|
maven("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven")
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
val compileKotlin: KotlinCompile by tasks
|
val compileKotlin: KotlinCompile by tasks
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ plugins {
|
|||||||
group 'testgroup'
|
group 'testgroup'
|
||||||
version '1.0-SNAPSHOT'
|
version '1.0-SNAPSHOT'
|
||||||
repositories {
|
repositories {
|
||||||
maven { url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven' }
|
maven { url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven' }
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
Reference in New Issue
Block a user