From ffafd96f1b112d80837a19cb7f1f684509e1c847 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 8 Oct 2019 18:33:31 +0300 Subject: [PATCH] Fix url for developers builds (KT-34246) #KT-34246 Fixed --- .../idea/configuration/ConfigureKotlinInProjectUtils.kt | 4 ++-- .../build.gradle.kts.3.5.after | 4 ++-- .../build.gradle.kts.4.9.after | 2 +- .../configureKotlinDevVersion/build.gradle.3.5.after | 4 ++-- .../configureKotlinDevVersion/build.gradle.4.9.after | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt index 50ec107a8bc..c82fde1b0c3 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt @@ -31,12 +31,12 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.findFirstPsiJavaModule import org.jetbrains.kotlin.idea.util.isDev import org.jetbrains.kotlin.idea.util.isEap +import org.jetbrains.kotlin.idea.util.isSnapshot import org.jetbrains.kotlin.idea.util.projectStructure.allModules import org.jetbrains.kotlin.idea.util.projectStructure.sdk import org.jetbrains.kotlin.idea.util.projectStructure.version import org.jetbrains.kotlin.idea.versions.SuppressNotificationState import org.jetbrains.kotlin.idea.versions.hasKotlinJsKjsmFile -import org.jetbrains.kotlin.idea.util.isSnapshot import org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinder import org.jetbrains.kotlin.resolve.jvm.modules.KOTLIN_STDLIB_MODULE_NAME import org.jetbrains.kotlin.utils.ifEmpty @@ -72,7 +72,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_dev_Compiler),number:$version,branch:default:any/artifacts/content/maven/", + "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:$version,branch:(default:any)/artifacts/content/maven", null, isSnapshot = false ) diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after index 2334b29c5c3..c18c22acede 100644 --- a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after +++ b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.3.5.after @@ -5,7 +5,7 @@ buildscript { var kotlin_version: String by extra kotlin_version = "1.2.60-dev-286" repositories { - maven { setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/") } + maven { setUrl("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") } mavenCentral() } dependencies { @@ -21,7 +21,7 @@ dependencies { implementation(kotlinModule("stdlib-jdk8", kotlin_version)) } repositories { - maven { setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/") } + maven { setUrl("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") } mavenCentral() } val compileKotlin: KotlinCompile by tasks diff --git a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after index fa8cdd6acba..f1d4a05265f 100644 --- a/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after +++ b/idea/testData/gradle/configurator/configureGradleKtsKotlinDevVersion/build.gradle.kts.4.9.after @@ -9,7 +9,7 @@ dependencies { implementation(kotlin("stdlib-jdk8")) } repositories { - maven { setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/") } + maven { setUrl("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") } mavenCentral() } val compileKotlin: KotlinCompile by tasks diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.3.5.after b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.3.5.after index 218bd63a07b..feef524f7dc 100644 --- a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.3.5.after +++ b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.3.5.after @@ -4,7 +4,7 @@ buildscript { ext.kotlin_version = '1.2.60-dev-286' repositories { maven { - url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/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' } mavenCentral() } @@ -15,7 +15,7 @@ buildscript { apply plugin: 'kotlin' repositories { maven { - url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/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' } mavenCentral() } diff --git a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after index 28fcdd9a066..e796ed80335 100644 --- a/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after +++ b/idea/testData/gradle/configurator/configureKotlinDevVersion/build.gradle.4.9.after @@ -5,7 +5,7 @@ group 'testgroup' version '1.0-SNAPSHOT' repositories { maven { - url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/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' } mavenCentral() }