From aed627210711831bc7226ae38f197727ca922c2a Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Fri, 10 Mar 2023 12:57:35 +0000 Subject: [PATCH] [K/N] Merge :kotlin-native-shared with :native:kotlin-native-utils * Code was moved to utils, but sources are included to the shared until bootstrap advance. * Fixed dependencies and set API & LV to 1.4 for the modules used with Gradle. Merge-request: KT-MR-9122 Merged-by: Pavel Punegov --- compiler/util-klib/build.gradle.kts | 10 ++++++++ .../kotlin/library/encodings/WobblyTF8.kt | 6 ++--- .../kotlin/library/encodings/WobblyTF8Test.kt | 6 ++--- .../backend.native/tests/build.gradle | 2 +- kotlin-native/build-tools/build.gradle.kts | 2 -- kotlin-native/shared/build.gradle.kts | 24 +++++++++---------- native/utils/build.gradle.kts | 8 +++++-- .../org/jetbrains/kotlin/konan/Exceptions.kt | 0 .../jetbrains/kotlin/konan/KonanAbiVersion.kt | 0 .../org/jetbrains/kotlin/konan/TempFiles.kt | 0 .../kotlin/konan/exec/ExecuteCommand.kt | 0 .../kotlin/konan/file/NativeFileType.kt | 0 .../kotlin/konan/library/KonanLibrary.kt | 0 .../konan/library/KonanLibraryLayout.kt | 0 .../konan/library/KonanLibraryWriter.kt | 0 .../konan/library/SearchPathResolver.kt | 0 .../konan/library/impl/BitcodeWriterImpl.kt | 0 .../konan/library/impl/KonanLibraryImpl.kt | 0 .../library/impl/KonanLibraryLayoutImpl.kt | 0 .../library/impl/KonanLibraryWriterImpl.kt | 0 .../kotlin/konan/target/AbstractToolConfig.kt | 0 .../jetbrains/kotlin/konan/target/Apple.kt | 0 .../kotlin/konan/target/ClangArgs.kt | 0 .../kotlin/konan/target/Configurables.kt | 0 .../konan/target/ConfigurablesExtensions.kt | 0 .../kotlin/konan/target/ConfigurablesImpl.kt | 0 .../kotlin/konan/target/KonanProperties.kt | 0 .../konan/target/KonanTargetExtenstions.kt | 0 .../jetbrains/kotlin/konan/target/Linker.kt | 0 .../jetbrains/kotlin/konan/target/Platform.kt | 0 .../kotlin/konan/target/Sanitizer.kt | 0 .../kotlin/konan/target/TargetProperties.kt | 0 .../kotlin/konan/target/TargetTriple.kt | 0 .../jetbrains/kotlin/konan/target/Windows.kt | 0 .../jetbrains/kotlin/konan/target/Xcode.kt | 0 .../jetbrains/kotlin/konan/util/DefFile.kt | 0 .../kotlin/konan/util/DependencyDownloader.kt | 0 .../kotlin/konan/util/DependencyExtractor.kt | 0 .../kotlin/konan/util/DependencyProcessor.kt | 0 .../kotlin/konan/util/PlatformLibsInfo.kt | 0 .../kotlin/konan/util/Substitution.kt | 0 .../kotlin/konan/target/CurrentXcodeTest.kt | 3 ++- .../build.gradle.kts | 2 +- 43 files changed, 38 insertions(+), 25 deletions(-) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/Exceptions.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/KonanAbiVersion.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/TempFiles.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/file/NativeFileType.kt (100%) rename {kotlin-native/shared/src/library/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/library/KonanLibrary.kt (100%) rename {kotlin-native/shared/src/library/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt (100%) rename {kotlin-native/shared/src/library/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/library/KonanLibraryWriter.kt (100%) rename {kotlin-native/shared/src/library/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt (100%) rename {kotlin-native/shared/src/library/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/library/impl/BitcodeWriterImpl.kt (100%) rename {kotlin-native/shared/src/library/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt (100%) rename {kotlin-native/shared/src/library/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt (100%) rename {kotlin-native/shared/src/library/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/AbstractToolConfig.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/Apple.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/ClangArgs.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/Configurables.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/ConfigurablesExtensions.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/KonanProperties.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/KonanTargetExtenstions.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/Linker.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/Platform.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/Sanitizer.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/TargetProperties.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/TargetTriple.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/Windows.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/target/Xcode.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/util/DefFile.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/util/PlatformLibsInfo.kt (100%) rename {kotlin-native/shared/src/main/kotlin => native/utils/src}/org/jetbrains/kotlin/konan/util/Substitution.kt (100%) rename {kotlin-native/shared/src/test/kotlin => native/utils/tests}/org/jetbrains/kotlin/konan/target/CurrentXcodeTest.kt (95%) diff --git a/compiler/util-klib/build.gradle.kts b/compiler/util-klib/build.gradle.kts index c6f670562ec..ac23365b417 100644 --- a/compiler/util-klib/build.gradle.kts +++ b/compiler/util-klib/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { kotlin("jvm") id("jps-compatible") @@ -16,6 +18,14 @@ sourceSets { "test" { projectDefault() } } +tasks.withType().configureEach { + kotlinOptions { + languageVersion = "1.4" + apiVersion = "1.4" + freeCompilerArgs += listOf("-Xsuppress-version-warnings") + } +} + publish() standardPublicJars() \ No newline at end of file diff --git a/compiler/util-klib/src/org/jetbrains/kotlin/library/encodings/WobblyTF8.kt b/compiler/util-klib/src/org/jetbrains/kotlin/library/encodings/WobblyTF8.kt index 5a5da789279..ca5a297ca72 100644 --- a/compiler/util-klib/src/org/jetbrains/kotlin/library/encodings/WobblyTF8.kt +++ b/compiler/util-klib/src/org/jetbrains/kotlin/library/encodings/WobblyTF8.kt @@ -29,11 +29,11 @@ object WobblyTF8 { if (char1 < '\u0080') { // U+0000..U+007F -> 0xxxxxxx // 7 meaningful bits -> 1 byte - buffer[writtenBytes++] = char1.code + buffer[writtenBytes++] = char1.toInt() } else if (char1 < '\u0800') { // U+0080..U+07FF -> 110xxxxx 10xxxxxx // 11 meaningful bits -> 2 bytes - val codePoint = char1.code + val codePoint = char1.toInt() buffer[writtenBytes++] = (codePoint ushr 6) or 0b1100_0000 buffer[writtenBytes++] = (codePoint and 0b0011_1111) or 0b1000_0000 } else { @@ -55,7 +55,7 @@ object WobblyTF8 { // U+0800..U+FFFF -> 1110xxxx 10xxxxxx 10xxxxxx // 16 meaningful bits -> 3 bytes - val codePoint = char1.code + val codePoint = char1.toInt() buffer[writtenBytes++] = (codePoint ushr 12) or 0b1110_0000 buffer[writtenBytes++] = ((codePoint ushr 6) and 0b0011_1111) or 0b1000_0000 buffer[writtenBytes++] = (codePoint and 0b0011_1111) or 0b1000_0000 diff --git a/compiler/util-klib/test/org/jetbrains/kotlin/library/encodings/WobblyTF8Test.kt b/compiler/util-klib/test/org/jetbrains/kotlin/library/encodings/WobblyTF8Test.kt index 35e962ee8c3..5455f643bde 100644 --- a/compiler/util-klib/test/org/jetbrains/kotlin/library/encodings/WobblyTF8Test.kt +++ b/compiler/util-klib/test/org/jetbrains/kotlin/library/encodings/WobblyTF8Test.kt @@ -152,9 +152,9 @@ class WobblyTF8Test { fun ByteArray.decodeWithWobbly(): String = WobblyTF8.decode(this) fun ByteArray.decodeWithUTF8(): String = toString(Charsets.UTF_8) - val CODE_POINTS_BEFORE_SURROGATES = MIN_CODE_POINT until MIN_SURROGATE.code - val CODE_POINTS_SURROGATES = MIN_SURROGATE.code..MAX_SURROGATE.code - val CODE_POINTS_AFTER_SURROGATES = (MAX_SURROGATE.code + 1) until MIN_SUPPLEMENTARY_CODE_POINT + val CODE_POINTS_BEFORE_SURROGATES = MIN_CODE_POINT until MIN_SURROGATE.toInt() + val CODE_POINTS_SURROGATES = MIN_SURROGATE.toInt()..MAX_SURROGATE.toInt() + val CODE_POINTS_AFTER_SURROGATES = (MAX_SURROGATE.toInt() + 1) until MIN_SUPPLEMENTARY_CODE_POINT val CODE_POINTS_SUPPLEMENTARY = MIN_SUPPLEMENTARY_CODE_POINT..MAX_CODE_POINT fun generateWellFormedString( diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index 485abb32931..2387868f897 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -210,7 +210,7 @@ task sanity { }) dependsOn(":kotlin-native:Interop:Indexer:check") dependsOn(":kotlin-native:Interop:StubGenerator:check") - dependsOn(":kotlin-native-shared:check") + dependsOn(":native:kotlin-native-utils:check") } boolean isExcluded(String dir) { diff --git a/kotlin-native/build-tools/build.gradle.kts b/kotlin-native/build-tools/build.gradle.kts index 1e385ab181c..4f65055cb02 100644 --- a/kotlin-native/build-tools/build.gradle.kts +++ b/kotlin-native/build-tools/build.gradle.kts @@ -58,8 +58,6 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion") implementation("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}") - implementation("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}") - api(project(":kotlin-native-shared")) } diff --git a/kotlin-native/shared/build.gradle.kts b/kotlin-native/shared/build.gradle.kts index 375d7f8db80..062c41def1e 100644 --- a/kotlin-native/shared/build.gradle.kts +++ b/kotlin-native/shared/build.gradle.kts @@ -42,15 +42,22 @@ java { kotlin { sourceSets { main { - kotlin.srcDir("src/main/kotlin") - kotlin.srcDir("src/library/kotlin") + // TODO: All code was moved to utils. Bootstrap should be advanced to make these classes appear + // in the bootstrap version of kotlin-native-utils. Only then this project should be removed, all usages + // of `:kotlin-native-shared` should be replaced with `:native:kotlin-native-utils` + kotlin.srcDir("../../native/utils/src") } } } tasks.withType().configureEach { - kotlinOptions.jvmTarget = "1.8" - kotlinOptions.freeCompilerArgs += listOf("-Xskip-prerelease-check") + kotlinOptions { + languageVersion = "1.4" + apiVersion = "1.4" + allWarningsAsErrors = false + jvmTarget = "1.8" + freeCompilerArgs += "-Xskip-prerelease-check" + } } val isCompositeBootstrap = project.extraProperties.has("kotlin.native.build.composite-bootstrap") @@ -60,7 +67,7 @@ val isCompositeBootstrap = project.extraProperties.has("kotlin.native.build.comp * * It to use this project in composite build (build-tools) and as a project itself. * Project should depend on a current snapshot builds while build-tools use bootstrap dependencies. - * TODO: merge this project with kotlin-native-utils to get rid of this hack + * TODO: finalize merge of this project with kotlin-native-utils to get rid of this hack */ fun compositeDependency(coordinates: String, subproject: String = ""): Any { val parts = coordinates.split(':') @@ -78,7 +85,6 @@ fun compositeDependency(coordinates: String, subproject: String = ""): Any { dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}") - api(compositeDependency("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}", ":native")) api(compositeDependency("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")) api(compositeDependency("org.jetbrains.kotlin:kotlin-util-io:${project.bootstrapKotlinVersion}")) @@ -92,9 +98,3 @@ dependencies { testApi("org.junit.jupiter:junit-jupiter") } } - -if (!isCompositeBootstrap) { - tasks.withType().configureEach() { - useJUnitPlatform() - } -} \ No newline at end of file diff --git a/native/utils/build.gradle.kts b/native/utils/build.gradle.kts index 83d57bea345..f4ec40fa30b 100644 --- a/native/utils/build.gradle.kts +++ b/native/utils/build.gradle.kts @@ -8,11 +8,13 @@ description = "Kotlin/Native utils" dependencies { compileOnly(kotlinStdlib()) api(project(":kotlin-util-io")) + api(project(":kotlin-util-klib")) api(platform(project(":kotlin-gradle-plugins-bom"))) testImplementation(commonDependency("junit:junit")) testImplementation(kotlinStdlib()) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } + testApiJUnit5() } sourceSets { @@ -28,10 +30,12 @@ tasks { freeCompilerArgs += "-Xsuppress-version-warnings" } } + + withType().configureEach { + useJUnitPlatform() + } } -// TODO: this single known external consumer of this artifact is Kotlin/Native backend, -// so publishing could be stopped after migration to monorepo publish() standardPublicJars() diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/Exceptions.kt b/native/utils/src/org/jetbrains/kotlin/konan/Exceptions.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/Exceptions.kt rename to native/utils/src/org/jetbrains/kotlin/konan/Exceptions.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/KonanAbiVersion.kt b/native/utils/src/org/jetbrains/kotlin/konan/KonanAbiVersion.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/KonanAbiVersion.kt rename to native/utils/src/org/jetbrains/kotlin/konan/KonanAbiVersion.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/TempFiles.kt b/native/utils/src/org/jetbrains/kotlin/konan/TempFiles.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/TempFiles.kt rename to native/utils/src/org/jetbrains/kotlin/konan/TempFiles.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt b/native/utils/src/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt rename to native/utils/src/org/jetbrains/kotlin/konan/exec/ExecuteCommand.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/NativeFileType.kt b/native/utils/src/org/jetbrains/kotlin/konan/file/NativeFileType.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/file/NativeFileType.kt rename to native/utils/src/org/jetbrains/kotlin/konan/file/NativeFileType.kt diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibrary.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/KonanLibrary.kt similarity index 100% rename from kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibrary.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/KonanLibrary.kt diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt similarity index 100% rename from kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibraryWriter.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/KonanLibraryWriter.kt similarity index 100% rename from kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibraryWriter.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/KonanLibraryWriter.kt diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt similarity index 100% rename from kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/BitcodeWriterImpl.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/impl/BitcodeWriterImpl.kt similarity index 100% rename from kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/BitcodeWriterImpl.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/impl/BitcodeWriterImpl.kt diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt similarity index 100% rename from kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt similarity index 100% rename from kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt similarity index 100% rename from kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/AbstractToolConfig.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/AbstractToolConfig.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/AbstractToolConfig.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/AbstractToolConfig.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Apple.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Apple.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Apple.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/Apple.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/ClangArgs.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/ClangArgs.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Configurables.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/Configurables.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesExtensions.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/ConfigurablesExtensions.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesExtensions.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/ConfigurablesExtensions.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanProperties.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/KonanProperties.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanTargetExtenstions.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTargetExtenstions.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanTargetExtenstions.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/KonanTargetExtenstions.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Linker.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/Linker.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Platform.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/Platform.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Sanitizer.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Sanitizer.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Sanitizer.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/Sanitizer.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/TargetProperties.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/TargetProperties.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/TargetProperties.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/TargetProperties.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/TargetTriple.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/TargetTriple.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/TargetTriple.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/TargetTriple.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Windows.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Windows.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Windows.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/Windows.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Xcode.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Xcode.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Xcode.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/Xcode.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DefFile.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/DefFile.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DefFile.kt rename to native/utils/src/org/jetbrains/kotlin/konan/util/DefFile.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt rename to native/utils/src/org/jetbrains/kotlin/konan/util/DependencyDownloader.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt rename to native/utils/src/org/jetbrains/kotlin/konan/util/DependencyExtractor.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt rename to native/utils/src/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/PlatformLibsInfo.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/PlatformLibsInfo.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/PlatformLibsInfo.kt rename to native/utils/src/org/jetbrains/kotlin/konan/util/PlatformLibsInfo.kt diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/Substitution.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/Substitution.kt similarity index 100% rename from kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/Substitution.kt rename to native/utils/src/org/jetbrains/kotlin/konan/util/Substitution.kt diff --git a/kotlin-native/shared/src/test/kotlin/org/jetbrains/kotlin/konan/target/CurrentXcodeTest.kt b/native/utils/tests/org/jetbrains/kotlin/konan/target/CurrentXcodeTest.kt similarity index 95% rename from kotlin-native/shared/src/test/kotlin/org/jetbrains/kotlin/konan/target/CurrentXcodeTest.kt rename to native/utils/tests/org/jetbrains/kotlin/konan/target/CurrentXcodeTest.kt index 31008263633..3b7f54b58a8 100644 --- a/kotlin-native/shared/src/test/kotlin/org/jetbrains/kotlin/konan/target/CurrentXcodeTest.kt +++ b/native/utils/tests/org/jetbrains/kotlin/konan/target/CurrentXcodeTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -18,6 +18,7 @@ internal class CurrentXcodeTest { assumeTrue(HostManager.hostIsMac) } } + @Test fun `Should be able to access Xcode bundle version`() { val version = CurrentXcode().bundleVersion diff --git a/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts index f96c519a9a9..7c309d3aa1d 100644 --- a/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts @@ -18,9 +18,9 @@ idePluginDependency { val embedded by configurations dependencies { - embedded(project(":kotlin-native-shared")) { isTransitive = false } embedded(project(":kotlin-native:backend.native")) { isTransitive = false } + proguardLibraryJars(project(":kotlin-native-shared")) { isTransitive = false } proguardLibraryJars(project(":kotlin-native:backend.native", "kotlin_stdlib_jar")) proguardLibraryJars(project(":kotlin-native:backend.native", "kotlin_reflect_jar")) proguardLibraryJars(project(":kotlin-native:backend.native", "cli_bcApiElements"))