From 3a5f33e9cd79ac530d37e42c286e464b9cad92a6 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Fri, 1 Mar 2024 21:29:49 +0100 Subject: [PATCH] [K/N] Convert :kotlin-native:klib Use folder structure from the rest of the project and build it by the bootstrap compiler. --- kotlin-native/klib/build.gradle.kts | 17 ++++------------- .../kotlin/cli/klib/DeclarationPrinter.kt | 0 .../klib/DefaultDeclarationHeaderRenderer.kt | 0 .../cli/klib/DefaultKlibSignatureRenderer.kt | 0 .../kotlin/cli/klib/IrSignaturesExtractor.kt | 0 .../kotlin/cli/klib/IrSignaturesRenderer.kt | 0 .../kotlin/cli/klib/KlibSignatureRenderer.kt | 0 .../kotlin/cli/klib/KlibToolArguments.kt | 0 .../kotlin/cli/klib/KlibToolArgumentsParser.kt | 0 .../kotlin/cli/klib/KlibToolCommands.kt | 0 .../kotlin/cli/klib/KlibToolIrLinker.kt | 0 .../jetbrains/kotlin/cli/klib/KlibToolLogger.kt | 0 .../jetbrains/kotlin/cli/klib/KlibToolOutput.kt | 0 .../cli/klib/KotlinpBasedMetadataDumper.kt | 0 .../kotlin/cli/klib/ModuleDescriptorLoader.kt | 0 .../kotlin/cli/klib/SignaturePrinter.kt | 0 .../kotlin/cli/klib/descriptorUtils.kt | 0 .../org/jetbrains/kotlin/cli/klib/main.kt | 0 18 files changed, 4 insertions(+), 13 deletions(-) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/DefaultDeclarationHeaderRenderer.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/IrSignaturesExtractor.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/IrSignaturesRenderer.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/KlibToolArguments.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/KlibToolArgumentsParser.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/KlibToolCommands.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/KlibToolIrLinker.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/KlibToolLogger.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/KlibToolOutput.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/ModuleDescriptorLoader.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/descriptorUtils.kt (100%) rename kotlin-native/klib/src/{main/kotlin => }/org/jetbrains/kotlin/cli/klib/main.kt (100%) diff --git a/kotlin-native/klib/build.gradle.kts b/kotlin-native/klib/build.gradle.kts index 69c8e10996e..67b51c19d38 100644 --- a/kotlin-native/klib/build.gradle.kts +++ b/kotlin-native/klib/build.gradle.kts @@ -1,17 +1,7 @@ -buildscript { - apply(from = "$rootDir/kotlin-native/gradle/kotlinGradlePlugin.gradle") -} - plugins { kotlin("jvm") } -repositories { - extra["bootstrapKotlinRepo"]?.let { - maven(url = it) - } -} - dependencies { implementation(project(":core:descriptors")) implementation(project(":native:frontend.native")) @@ -23,6 +13,7 @@ dependencies { implementation(project(":kotlin-metadata")) { isTransitive = false } } -tasks.withType> { - compilerOptions.freeCompilerArgs.add("-Xskip-prerelease-check") -} +sourceSets { + "main" { projectDefault() } + "test" { none() } +} \ No newline at end of file diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/DeclarationPrinter.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultDeclarationHeaderRenderer.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/DefaultDeclarationHeaderRenderer.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultDeclarationHeaderRenderer.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/DefaultDeclarationHeaderRenderer.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/DefaultKlibSignatureRenderer.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/IrSignaturesExtractor.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/IrSignaturesExtractor.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/IrSignaturesExtractor.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/IrSignaturesExtractor.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/IrSignaturesRenderer.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/IrSignaturesRenderer.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/IrSignaturesRenderer.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/IrSignaturesRenderer.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibSignatureRenderer.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolArguments.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolArguments.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolArguments.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolArguments.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolArgumentsParser.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolArgumentsParser.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolArgumentsParser.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolArgumentsParser.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolCommands.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolCommands.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolCommands.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolCommands.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolIrLinker.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolIrLinker.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolIrLinker.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolIrLinker.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolLogger.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolLogger.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolLogger.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolLogger.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolOutput.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolOutput.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibToolOutput.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KlibToolOutput.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/ModuleDescriptorLoader.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/ModuleDescriptorLoader.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/ModuleDescriptorLoader.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/ModuleDescriptorLoader.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/SignaturePrinter.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/descriptorUtils.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/descriptorUtils.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/descriptorUtils.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/descriptorUtils.kt diff --git a/kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt b/kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/main.kt similarity index 100% rename from kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt rename to kotlin-native/klib/src/org/jetbrains/kotlin/cli/klib/main.kt