diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt index af77f5b6d28..977cc796709 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt @@ -110,8 +110,6 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider( KotlinFUSLogger.log(FUSEventGroups.NPWizards, this.javaClass.simpleName) } - private fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }" - protected abstract fun getOldSyntaxPluginDefinition(): String protected abstract fun getPluginDefinition(): String diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt index f6d711c7c95..1ac0e2ba664 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt @@ -85,7 +85,7 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes "konan/utils/build/libs" ) val customRepositories = arrayOf("https://dl.bintray.com/kotlin/kotlin-dev", "http://dl.bintray.com/kotlin/kotlin-eap") - val customMavenRepositories = customRepositories.map { if (useKts) "maven { setUrl(\"$it\") }" else "maven { url '$it' } " }.joinToString("\n") + val customMavenRepositories = customRepositories.map { if (useKts) "maven(\"$it\")" else "maven { url '$it' } " }.joinToString("\n") val baseFolder = File(".").absolutePath.replace("\\", "/") val quote = if (useKts) '"' else '\'' val flatDirRepositories = if (useMaster) 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 6b76364261d..54040607304 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 @@ -97,7 +97,13 @@ fun DependencyScope.toGradleCompileScope(isAndroidModule: Boolean) = when (this) fun RepositoryDescription.toGroovyRepositorySnippet() = "maven { url '$url' }" -fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }" +/** + * This syntax has been released in kotlin-dsl-0.11.1 release and in Gradle 4.2-RC1 release. + * + * We already require Gradle distribution of higher version (see `checkGradleCompatibility` function), + * so it is safe to use this syntax everywhere. + */ +fun RepositoryDescription.toKotlinRepositorySnippet() = "maven(\"$url\")" fun getRepositoryForVersion(version: String): RepositoryDescription? = when { isSnapshot(version) -> SNAPSHOT_REPOSITORY diff --git a/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts b/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts index 81f75371138..d95125b5e9b 100644 --- a/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts +++ b/idea/testData/configuration/gsk/eap11Version/build_after.gradle.kts @@ -12,7 +12,7 @@ application { repositories { jcenter() - maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") } + maven("https://dl.bintray.com/kotlin/kotlin-eap") } dependencies { diff --git a/idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts b/idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts index 77222888439..abadf6019b6 100644 --- a/idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts +++ b/idea/testData/configuration/gsk/eapVersion/build_after.gradle.kts @@ -11,7 +11,7 @@ application { repositories { jcenter() - maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") } + maven("https://dl.bintray.com/kotlin/kotlin-eap") } dependencies { 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 f1d4a05265f..16917c7cbf8 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_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_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/configureJsEAPWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after index 5e83d211553..f52be89aca4 100644 --- a/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after +++ b/idea/testData/gradle/configurator/configureJsEAPWithBuildGradleKts/build.gradle.kts.after @@ -6,7 +6,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") } + maven("https://dl.bintray.com/kotlin/kotlin-eap") } dependencies { implementation(kotlin("stdlib-js")) diff --git a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after index 7a19e66bdc8..1d2ec9c5885 100644 --- a/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after +++ b/idea/testData/gradle/configurator/configureJvmEAPWithBuildGradleKts/build.gradle.kts.after @@ -10,7 +10,7 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") } + maven("https://dl.bintray.com/kotlin/kotlin-eap") } dependencies { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index a8741cfa418..2c6da988cbd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -139,7 +139,7 @@ class NewMultiplatformIT : BaseGradleIT() { with(appProject) { setupWorkingDir() - gradleBuildScript().appendText("\nrepositories { maven { setUrl(\"$libLocalRepoUri\") } }") + gradleBuildScript().appendText("\nrepositories { maven(\"$libLocalRepoUri\") }") fun CompiledProject.checkProgramCompilationCommandLine(check: (String) -> Unit) { output.lineSequence().filter {