From ec8bc6a64fb8c05727df184d7bc5357f24241ccc Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Fri, 1 Mar 2024 21:26:05 +0100 Subject: [PATCH] [K/N] Convert :kotlin-native:utilities:cli-runner buildscript to kts Use folder structure from the rest of the project and build it by the bootstrap compiler. --- .../utilities/cli-runner/build.gradle | 24 ------------------- .../utilities/cli-runner/build.gradle.kts | 18 ++++++++++++++ .../utilities/GeneratePlatformLibraries.kt | 0 .../kotlin/cli/utilities/InteropCompiler.kt | 0 .../kotlin/cli/utilities/LlvmClang.kt | 0 .../jetbrains/kotlin/cli/utilities/main.kt | 0 6 files changed, 18 insertions(+), 24 deletions(-) delete mode 100644 kotlin-native/utilities/cli-runner/build.gradle create mode 100644 kotlin-native/utilities/cli-runner/build.gradle.kts rename kotlin-native/utilities/cli-runner/src/{main/kotlin => }/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt (100%) rename kotlin-native/utilities/cli-runner/src/{main/kotlin => }/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt (100%) rename kotlin-native/utilities/cli-runner/src/{main/kotlin => }/org/jetbrains/kotlin/cli/utilities/LlvmClang.kt (100%) rename kotlin-native/utilities/cli-runner/src/{main/kotlin => }/org/jetbrains/kotlin/cli/utilities/main.kt (100%) diff --git a/kotlin-native/utilities/cli-runner/build.gradle b/kotlin-native/utilities/cli-runner/build.gradle deleted file mode 100644 index 67e6452a7a7..00000000000 --- a/kotlin-native/utilities/cli-runner/build.gradle +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the LICENSE file. - */ -buildscript { - apply from: "$rootDir/kotlin-native/gradle/kotlinGradlePlugin.gradle" -} - -apply plugin: 'kotlin' - -compileKotlin { - compilerOptions.freeCompilerArgs.add('-Xskip-metadata-version-check') -} - - -dependencies { - implementation project(":kotlin-stdlib") - implementation project(':kotlin-native:backend.native') - implementation project(":compiler:cli-common") - implementation project(':kotlin-native:Interop:StubGenerator') - implementation project(':kotlin-native:klib') - implementation project(path: ":kotlin-native:endorsedLibraries:kotlinx.cli", configuration: "jvmRuntimeElements") - implementation project(":native:kotlin-native-utils") -} diff --git a/kotlin-native/utilities/cli-runner/build.gradle.kts b/kotlin-native/utilities/cli-runner/build.gradle.kts new file mode 100644 index 00000000000..4c25e96078b --- /dev/null +++ b/kotlin-native/utilities/cli-runner/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + kotlin("jvm") +} + +dependencies { + implementation(kotlinStdlib()) + implementation(project(":kotlin-native:backend.native")) + implementation(project(":compiler:cli-common")) + implementation(project(":kotlin-native:Interop:StubGenerator")) + implementation(project(":kotlin-native:klib")) + implementation(project(":kotlin-native:endorsedLibraries:kotlinx.cli", configuration = "jvmRuntimeElements")) + implementation(project(":native:kotlin-native-utils")) +} + +sourceSets { + "main" { projectDefault() } + "test" { none() } +} \ No newline at end of file diff --git a/kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt b/kotlin-native/utilities/cli-runner/src/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt similarity index 100% rename from kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt rename to kotlin-native/utilities/cli-runner/src/org/jetbrains/kotlin/cli/utilities/GeneratePlatformLibraries.kt diff --git a/kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt b/kotlin-native/utilities/cli-runner/src/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt similarity index 100% rename from kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt rename to kotlin-native/utilities/cli-runner/src/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt diff --git a/kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/LlvmClang.kt b/kotlin-native/utilities/cli-runner/src/org/jetbrains/kotlin/cli/utilities/LlvmClang.kt similarity index 100% rename from kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/LlvmClang.kt rename to kotlin-native/utilities/cli-runner/src/org/jetbrains/kotlin/cli/utilities/LlvmClang.kt diff --git a/kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/main.kt b/kotlin-native/utilities/cli-runner/src/org/jetbrains/kotlin/cli/utilities/main.kt similarity index 100% rename from kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/main.kt rename to kotlin-native/utilities/cli-runner/src/org/jetbrains/kotlin/cli/utilities/main.kt