From 54f7633738ad398e45fc1af731fc74dacfa85e36 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Mon, 19 Apr 2021 12:52:23 +0200 Subject: [PATCH] build.gradle.kts: exclude :kotlin-ide from `allprojects` We don't need to setup compiler args and JDK version for kotlin-ide modules. Generated build.gradle.kts will do it themselves --- build.gradle.kts | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a3b69a43d5b..aa226eb7056 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -399,6 +399,29 @@ val defaultJavaHome = jdkPath(if (Platform[203].orHigher()) "11" else defaultJvm val ignoreTestFailures by extra(project.kotlinBuildProperties.ignoreTestFailures) allprojects { + val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString() + + repositories { + kotlinBuildLocalRepo(project) + mirrorRepo?.let(::maven) + + internalBootstrapRepo?.let(::maven) + bootstrapKotlinRepo?.let(::maven) + maven(protobufRepo) + + maven(intellijRepo) + + mavenCentral() + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") + maven("https://dl.google.com/dl/android/maven2") + maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies") + + jcenter() + } + + if (path.startsWith(":kotlin-ide.")) { + return@allprojects + } configurations.maybeCreate("embedded").apply { isCanBeConsumed = false @@ -427,25 +450,6 @@ allprojects { // therefore it is disabled by default // buildDir = File(commonBuildDir, project.name) - val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString() - - repositories { - kotlinBuildLocalRepo(project) - mirrorRepo?.let(::maven) - - internalBootstrapRepo?.let(::maven) - bootstrapKotlinRepo?.let(::maven) - maven(protobufRepo) - - maven(intellijRepo) - - mavenCentral() - maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - maven("https://dl.google.com/dl/android/maven2") - maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies") - - jcenter() - } configureJvmProject(javaHome!!, jvmTarget!!)