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

Fix import for JPS build of Kotlin repo

Browse Source 
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:
Aleksei.Cherepanov
2021-06-07 12:03:40 +03:00
parent 2653565f56
commit 35c067b215
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/dependencies.kt
+1 -1
View File
@@ -36,7 +36,7 @@ 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," +
else -> "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate),number:$bootstrapKotlinVersion," +
"branch:default:any/artifacts/content/internal/repo/"
}
dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ var Project.bootstrapKotlinRepo: String?
@Deprecated("Obsolete, use internalBootstrapRepo instead.")
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"
fun Project.kotlinBootstrapFrom(defaultSource: BootstrapOption) {
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+1 -1
View File
@@ -70,7 +70,7 @@ val DEFAULT_GRADLE_PLUGIN_REPOSITORY = RepositoryDescription(
fun devRepository(version: String) = RepositoryDescription(
"teamcity.kotlin.dev",
"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,
isSnapshot = false
)
idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
implementation(kotlin("stdlib-jdk8"))
}
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()
}
val compileKotlin: KotlinCompile by tasks
idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.after
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
implementation(kotlin("stdlib-jdk8"))
}
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()
}
val compileKotlin: KotlinCompile by tasks
idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.after
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ plugins {
group 'testgroup'
version '1.0-SNAPSHOT'
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()
}
dependencies {