From b09d2f248a99142f4f6bdb336f1e7258d1b8af58 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Mon, 13 Feb 2023 19:25:35 +0100 Subject: [PATCH] [K/N][build] Add gradle settings to build-tools --- kotlin-native/build-tools/gradle.properties | 11 ----------- kotlin-native/build-tools/settings.gradle.kts | 9 +++------ 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/kotlin-native/build-tools/gradle.properties b/kotlin-native/build-tools/gradle.properties index 8c2dce3fd96..26f79cb7fea 100644 --- a/kotlin-native/build-tools/gradle.properties +++ b/kotlin-native/build-tools/gradle.properties @@ -2,15 +2,4 @@ cacheRedirectorEnabled=true bootstrap.kotlin.default.version=1.9.0-dev-877 kotlin.build.gradlePlugin.version=0.0.39 -org.gradle.java.installations.fromEnv=\ - JDK_1_6,JDK_16,\ - JDK_1_7,JDK_17,\ - JDK_1_8,JDK_18,\ - JDK_9_0,JDK_9,\ - JDK_10_0,JDK_10,\ - JDK_11_0,JDK_11,\ - JDK_15_0,JDK_15,\ - JDK_16_0,\ - JDK_17_0 - kotlin.native.build.composite-bootstrap=true \ No newline at end of file diff --git a/kotlin-native/build-tools/settings.gradle.kts b/kotlin-native/build-tools/settings.gradle.kts index 3bac69d298d..8541c2c5c05 100644 --- a/kotlin-native/build-tools/settings.gradle.kts +++ b/kotlin-native/build-tools/settings.gradle.kts @@ -3,6 +3,9 @@ rootProject.name = "build-tools" pluginManagement { apply(from = "../../repo/scripts/cache-redirector.settings.gradle.kts") apply(from = "../../repo/scripts/kotlin-bootstrap.settings.gradle.kts") + + includeBuild("../../repo/gradle-settings-conventions") + repositories { maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") mavenCentral() @@ -16,12 +19,6 @@ plugins { } buildscript { - repositories { - maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") - mavenCentral() - gradlePluginPortal() - } - val buildGradlePluginVersion = extra["kotlin.build.gradlePlugin.version"] dependencies { classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:$buildGradlePluginVersion")