From 837d100cdaec381a20415902f523415d5c46bde9 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Mon, 8 Aug 2022 12:47:19 +0200 Subject: [PATCH] Drop settings.gradle.kts from kotlin-native/shared Review: https://jetbrains.team/p/kt/reviews/6753 I don't know why this settings.gradle.kts is needed. But I think that it was needed before "kotlin-native merge into kotlin" times. (Pavel Punegov says the same) I try to remove and if CI doesn't fail then I will push it. I need to drop settings.gradle.kts because I'm going to replace kotlin-reflect dependency from source to binary in the next commits. And before doing this refactoring I want to normalize all the dependencies on kotlin-reflect. --- kotlin-native/shared/build.gradle.kts | 4 ++-- kotlin-native/shared/settings.gradle.kts | 23 ----------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 kotlin-native/shared/settings.gradle.kts diff --git a/kotlin-native/shared/build.gradle.kts b/kotlin-native/shared/build.gradle.kts index bf11d5988f5..cca077ac9c9 100644 --- a/kotlin-native/shared/build.gradle.kts +++ b/kotlin-native/shared/build.gradle.kts @@ -51,8 +51,8 @@ tasks.jar { dependencies { kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion") - implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") - implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") + implementation(kotlinStdlib()) + implementation(project(":kotlin-reflect")) api("org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion") api("org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion") } diff --git a/kotlin-native/shared/settings.gradle.kts b/kotlin-native/shared/settings.gradle.kts deleted file mode 100644 index 2d0d0815c95..00000000000 --- a/kotlin-native/shared/settings.gradle.kts +++ /dev/null @@ -1,23 +0,0 @@ -pluginManagement { - val rootProperties = java.util.Properties().apply { - rootDir.resolve("../gradle.properties").reader().use(::load) - } - - val kotlinVersion: String by rootProperties - - repositories { - maven(project.bootstrapKotlinRepo) - maven("https://cache-redirector.jetbrains.com/maven-central") - mavenCentral() - } - - resolutionStrategy { - eachPlugin { - if (requested.id.id == "kotlin") { - useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") - } - } - } -} - -rootProject.name = "kotlin-native-shared"