diff --git a/build.gradle.kts b/build.gradle.kts index d2796857047..b7c0a139cac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -613,7 +613,7 @@ tasks { register("konan-tests") { dependsOn("dist") dependsOn( - ":kotlin-native:commonizer:test" + ":native:kotlin-native-commonizer:test" ) } diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 5bd131f59a3..9ce1a8e0c63 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -128,7 +128,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompileOnly(intellijPluginDep("coverage")) - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } testRuntime(commonDep("org.jetbrains", "markdown")) testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 95dbe36df57..57452d543c4 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } testCompile(intellijDep()) testCompile(intellijPluginDep("properties")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 50761df9413..9df9f29eb17 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compile(project(":js:js.frontend")) - compile(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + compile(project(":native:kotlin-native-utils")) { isTransitive = false } compileOnly(intellijDep()) compileOnly(intellijPluginDep("gradle")) @@ -50,7 +50,7 @@ dependencies { testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":idea:idea-new-project-wizard")) testRuntime(project(":kotlin-reflect")) diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index 7f22da72c7c..28ede100807 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { testCompile(project(":idea:idea-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts index 7b4eea9f584..7fcff5a7451 100644 --- a/idea/idea-native/build.gradle.kts +++ b/idea/idea-native/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { compile(project(":idea:idea-jvm")) compile(project(":compiler:frontend")) compile(project(":native:frontend.native")) - compile(project(":kotlin-native:kotlin-native-utils")) + compile(project(":native:kotlin-native-utils")) compileOnly(intellijDep()) Platform[192].orHigher { diff --git a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts index dd6b6e5960e..2671894f99c 100644 --- a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { testRuntime(project(":idea:idea-native")) { isTransitive = false } testRuntime(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":kotlin-reflect")) testRuntime(project(":sam-with-receiver-ide-plugin")) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index dd1df395b60..6105c4165c7 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts index 98021054c4b..cc791b93d37 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts @@ -13,7 +13,7 @@ standardPublicJars() dependencies { compile(kotlinStdlib()) - compile(project(":kotlin-native:kotlin-native-utils")) + compile(project(":native:kotlin-native-utils")) compileOnly(gradleApi()) compileOnly("com.android.tools.build:gradle:0.4.2") diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts index 0f76de14378..ec4cfa47341 100644 --- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/build.gradle.kts @@ -7,7 +7,7 @@ plugins { dependencies { compile(gradleApi()) compile(project(":kotlin-gradle-plugin-api")) - compile(project(":kotlin-native:kotlin-native-utils")) + compile(project(":native:kotlin-native-utils")) } val generateMppTargetContainerWithPresets by generator( diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 17bff75754b..b1188236843 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { compileOnly(project(":daemon-common")) compile(kotlinStdlib()) - compile(project(":kotlin-native:kotlin-native-utils")) + compile(project(":native:kotlin-native-utils")) compile(project(":kotlin-util-klib")) compileOnly(project(":kotlin-reflect-api")) compileOnly(project(":kotlin-android-extensions")) diff --git a/konan/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts similarity index 96% rename from konan/commonizer/build.gradle.kts rename to native/commonizer/build.gradle.kts index ece22cb183f..9edf03f611a 100644 --- a/konan/commonizer/build.gradle.kts +++ b/native/commonizer/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { compile(kotlinStdlib()) compile(project(":kotlin-util-klib-metadata")) - compile(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + compile(project(":native:kotlin-native-utils")) { isTransitive = false } compile(project(":native:frontend.native")) { isTransitive = false } testCompile(commonDep("junit:junit")) diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizationParameters.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizationParameters.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizationParameters.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizationParameters.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizationResult.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizationResult.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizationResult.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/CommonizationResult.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/StatsCollector.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/StatsCollector.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/StatsCollector.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/StatsCollector.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/Target.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/Target.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/Target.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/Target.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedAnnotationDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedAnnotationDescriptor.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedAnnotationDescriptor.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedAnnotationDescriptor.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedClassDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedClassDescriptor.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedClassDescriptor.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedClassDescriptor.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedMemberScope.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedMemberScope.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedMemberScope.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedMemberScope.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedPackageFragmentProvider.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedPackageFragmentProvider.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedPackageFragmentProvider.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedPackageFragmentProvider.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeAliasDescriptor.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeParameterDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeParameterDescriptor.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeParameterDescriptor.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/CommonizedTypeParameterDescriptor.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor1.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor1.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor1.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor1.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor2.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor2.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor2.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/DeclarationsBuilderVisitor2.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/classDescriptors.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/classDescriptors.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/classDescriptors.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/classDescriptors.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/context.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/context.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/context.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/context.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/functionDescriptors.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/moduleDescriptors.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/moduleDescriptors.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/moduleDescriptors.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/moduleDescriptors.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/packageFragments.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/packageFragments.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/packageFragments.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/packageFragments.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/propertyDescriptors.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/propertyDescriptors.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/propertyDescriptors.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/propertyDescriptors.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/typeAliasDescriptors.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/typeAliasDescriptors.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/typeAliasDescriptors.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/typeAliasDescriptors.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/cliUtils.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/cliUtils.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/cliUtils.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/cliUtils.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeDistributionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeDistributionCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeDistributionCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeDistributionCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractFunctionOrPropertyCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractListCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractListCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractListCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractListCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractNullableCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractNullableCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractNullableCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractNullableCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassConstructorCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/Commonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ExtensionReceiverCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ExtensionReceiverCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ExtensionReceiverCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ExtensionReceiverCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/FunctionModifiersCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModalityCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModalityCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModalityCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModalityCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModuleCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModuleCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModuleCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ModuleCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertyCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PropertySetterCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeParameterCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ValueParameterCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/VisibilityCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeModuleForCommonization.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeModuleForCommonization.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeModuleForCommonization.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeModuleForCommonization.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeSensitiveManifestData.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeStatsCollector.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeStatsCollector.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeStatsCollector.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeStatsCollector.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/callableMembers.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/callableMembers.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/callableMembers.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/callableMembers.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/classifiers.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/classifiers.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/classifiers.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/classifiers.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirAnnotation.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirAnnotation.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirAnnotation.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirAnnotation.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirClass.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirClass.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirClass.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirClass.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirDeclaration.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirDeclaration.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirDeclaration.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirDeclaration.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirFunction.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirFunction.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirFunction.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirFunction.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirFunctionOrProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirFunctionOrProperty.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirFunctionOrProperty.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirFunctionOrProperty.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirModule.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirModule.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirModule.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirModule.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirNodeVisitor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirNodeVisitor.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirNodeVisitor.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirNodeVisitor.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirPackage.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirPackage.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirPackage.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirPackage.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirProperty.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirRoot.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirRoot.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirRoot.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirRoot.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirType.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirType.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirType.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirType.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirTypeAlias.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirTypeAlias.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirTypeAlias.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirTypeAlias.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirTypeParameter.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirTypeParameter.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirTypeParameter.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/CirTypeParameter.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodeBuilders.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodeBuilders.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodeBuilders.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodeBuilders.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodes.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodes.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodes.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/ir/nodes.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/memberScopes.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/modules.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/modules.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/modules.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/modules.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/packages.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/packages.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/packages.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/packages.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/root.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/root.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/root.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/root.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/EmptyDescriptorTable.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/EmptyDescriptorTable.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/EmptyDescriptorTable.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/EmptyDescriptorTable.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/NativeFactories.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/NativeFactories.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/NativeFactories.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/NativeFactories.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ResettableClockMark.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ResettableClockMark.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ResettableClockMark.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ResettableClockMark.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/blacklist.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/blacklist.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/blacklist.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/blacklist.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/commonizedGroup.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/commonizedGroup.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/commonizedGroup.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/commonizedGroup.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/fqName.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/misc.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/moduleDescriptor.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/moduleDescriptor.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/moduleDescriptor.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/moduleDescriptor.kt diff --git a/konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt similarity index 100% rename from konan/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt rename to native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/type.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/common/package_root.kt b/native/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/common/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/js/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/jvm/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/extensionReceivers/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/extensionReceivers/original/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/extensionReceivers/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/extensionReceivers/original/js/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/extensionReceivers/original/js/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/extensionReceivers/original/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/extensionReceivers/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/extensionReceivers/original/jvm/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/extensionReceivers/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/returnTypes/commonized/common/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/returnTypes/commonized/common/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/returnTypes/commonized/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/returnTypes/commonized/js/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/returnTypes/commonized/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/returnTypes/commonized/jvm/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/returnTypes/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/returnTypes/original/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/returnTypes/original/js/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/returnTypes/original/js/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/returnTypes/original/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/returnTypes/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/returnTypes/original/jvm/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/returnTypes/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/visibility/commonized/common/package_root.kt b/native/commonizer/testData/callableMemberCommonization/visibility/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/visibility/commonized/common/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/visibility/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/visibility/commonized/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/visibility/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/visibility/commonized/js/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/visibility/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/visibility/commonized/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/visibility/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/visibility/commonized/jvm/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/visibility/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/visibility/original/js/package_root.kt b/native/commonizer/testData/callableMemberCommonization/visibility/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/visibility/original/js/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/visibility/original/js/package_root.kt diff --git a/konan/commonizer/testData/callableMemberCommonization/visibility/original/jvm/package_root.kt b/native/commonizer/testData/callableMemberCommonization/visibility/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/callableMemberCommonization/visibility/original/jvm/package_root.kt rename to native/commonizer/testData/callableMemberCommonization/visibility/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/common/package_root.kt b/native/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/common/package_root.kt rename to native/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/js/package_root.kt b/native/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/classKindAndModifiers/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/classKindAndModifiers/original/js/package_root.kt b/native/commonizer/testData/classifierCommonization/classKindAndModifiers/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/classKindAndModifiers/original/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/classKindAndModifiers/original/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/classKindAndModifiers/original/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/classKindAndModifiers/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/classKindAndModifiers/original/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/classKindAndModifiers/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/constructors/commonized/common/package_root.kt b/native/commonizer/testData/classifierCommonization/constructors/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/constructors/commonized/common/package_root.kt rename to native/commonizer/testData/classifierCommonization/constructors/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/constructors/commonized/js/package_root.kt b/native/commonizer/testData/classifierCommonization/constructors/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/constructors/commonized/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/constructors/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/constructors/commonized/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/constructors/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/constructors/commonized/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/constructors/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/constructors/original/js/package_root.kt b/native/commonizer/testData/classifierCommonization/constructors/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/constructors/original/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/constructors/original/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/constructors/original/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/constructors/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/constructors/original/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/constructors/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/modality/commonized/common/package_root.kt b/native/commonizer/testData/classifierCommonization/modality/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/modality/commonized/common/package_root.kt rename to native/commonizer/testData/classifierCommonization/modality/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/modality/commonized/js/package_root.kt b/native/commonizer/testData/classifierCommonization/modality/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/modality/commonized/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/modality/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/modality/commonized/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/modality/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/modality/commonized/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/modality/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/modality/original/js/package_root.kt b/native/commonizer/testData/classifierCommonization/modality/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/modality/original/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/modality/original/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/modality/original/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/modality/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/modality/original/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/modality/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/supertypes/commonized/common/package_root.kt b/native/commonizer/testData/classifierCommonization/supertypes/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/supertypes/commonized/common/package_root.kt rename to native/commonizer/testData/classifierCommonization/supertypes/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/supertypes/commonized/js/package_root.kt b/native/commonizer/testData/classifierCommonization/supertypes/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/supertypes/commonized/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/supertypes/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/supertypes/commonized/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/supertypes/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/supertypes/commonized/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/supertypes/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/supertypes/original/js/package_root.kt b/native/commonizer/testData/classifierCommonization/supertypes/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/supertypes/original/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/supertypes/original/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/supertypes/original/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/supertypes/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/supertypes/original/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/supertypes/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeAliases/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeAliases/commonized/js/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeAliases/commonized/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeAliases/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeAliases/commonized/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeAliases/commonized/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeAliases/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeAliases/original/js/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeAliases/original/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeAliases/original/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeAliases/original/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/typeAliases/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeAliases/original/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeAliases/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeParameters/commonized/common/package_root.kt b/native/commonizer/testData/classifierCommonization/typeParameters/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeParameters/commonized/common/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeParameters/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeParameters/commonized/js/package_root.kt b/native/commonizer/testData/classifierCommonization/typeParameters/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeParameters/commonized/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeParameters/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeParameters/commonized/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/typeParameters/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeParameters/commonized/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeParameters/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeParameters/original/js/package_root.kt b/native/commonizer/testData/classifierCommonization/typeParameters/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeParameters/original/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeParameters/original/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/typeParameters/original/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/typeParameters/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/typeParameters/original/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/typeParameters/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/visibility/commonized/common/package_root.kt b/native/commonizer/testData/classifierCommonization/visibility/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/visibility/commonized/common/package_root.kt rename to native/commonizer/testData/classifierCommonization/visibility/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/visibility/commonized/js/package_root.kt b/native/commonizer/testData/classifierCommonization/visibility/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/visibility/commonized/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/visibility/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/visibility/commonized/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/visibility/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/visibility/commonized/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/visibility/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/visibility/original/js/package_root.kt b/native/commonizer/testData/classifierCommonization/visibility/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/visibility/original/js/package_root.kt rename to native/commonizer/testData/classifierCommonization/visibility/original/js/package_root.kt diff --git a/konan/commonizer/testData/classifierCommonization/visibility/original/jvm/package_root.kt b/native/commonizer/testData/classifierCommonization/visibility/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/classifierCommonization/visibility/original/jvm/package_root.kt rename to native/commonizer/testData/classifierCommonization/visibility/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/specifics/commonized/common/package_root.kt b/native/commonizer/testData/functionCommonization/specifics/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/specifics/commonized/common/package_root.kt rename to native/commonizer/testData/functionCommonization/specifics/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/specifics/commonized/js/package_root.kt b/native/commonizer/testData/functionCommonization/specifics/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/specifics/commonized/js/package_root.kt rename to native/commonizer/testData/functionCommonization/specifics/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/specifics/commonized/jvm/package_root.kt b/native/commonizer/testData/functionCommonization/specifics/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/specifics/commonized/jvm/package_root.kt rename to native/commonizer/testData/functionCommonization/specifics/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/specifics/original/js/package_root.kt b/native/commonizer/testData/functionCommonization/specifics/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/specifics/original/js/package_root.kt rename to native/commonizer/testData/functionCommonization/specifics/original/js/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/specifics/original/jvm/package_root.kt b/native/commonizer/testData/functionCommonization/specifics/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/specifics/original/jvm/package_root.kt rename to native/commonizer/testData/functionCommonization/specifics/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/valueParameters/commonized/common/package_root.kt b/native/commonizer/testData/functionCommonization/valueParameters/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/valueParameters/commonized/common/package_root.kt rename to native/commonizer/testData/functionCommonization/valueParameters/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/valueParameters/commonized/js/package_root.kt b/native/commonizer/testData/functionCommonization/valueParameters/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/valueParameters/commonized/js/package_root.kt rename to native/commonizer/testData/functionCommonization/valueParameters/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/valueParameters/commonized/jvm/package_root.kt b/native/commonizer/testData/functionCommonization/valueParameters/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/valueParameters/commonized/jvm/package_root.kt rename to native/commonizer/testData/functionCommonization/valueParameters/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/valueParameters/original/js/package_root.kt b/native/commonizer/testData/functionCommonization/valueParameters/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/valueParameters/original/js/package_root.kt rename to native/commonizer/testData/functionCommonization/valueParameters/original/js/package_root.kt diff --git a/konan/commonizer/testData/functionCommonization/valueParameters/original/jvm/package_root.kt b/native/commonizer/testData/functionCommonization/valueParameters/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/functionCommonization/valueParameters/original/jvm/package_root.kt rename to native/commonizer/testData/functionCommonization/valueParameters/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/annotations/commonized/common/package_root.kt b/native/commonizer/testData/generalCommonization/annotations/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/annotations/commonized/common/package_root.kt rename to native/commonizer/testData/generalCommonization/annotations/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/annotations/commonized/js/package_root.kt b/native/commonizer/testData/generalCommonization/annotations/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/annotations/commonized/js/package_root.kt rename to native/commonizer/testData/generalCommonization/annotations/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/annotations/commonized/jvm/package_root.kt b/native/commonizer/testData/generalCommonization/annotations/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/annotations/commonized/jvm/package_root.kt rename to native/commonizer/testData/generalCommonization/annotations/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/annotations/original/js/package_root.kt b/native/commonizer/testData/generalCommonization/annotations/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/annotations/original/js/package_root.kt rename to native/commonizer/testData/generalCommonization/annotations/original/js/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/annotations/original/jvm/package_root.kt b/native/commonizer/testData/generalCommonization/annotations/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/annotations/original/jvm/package_root.kt rename to native/commonizer/testData/generalCommonization/annotations/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/common/package_org_sample_two.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/common/package_org_sample_two.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/common/package_org_sample_two.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/common/package_org_sample_two.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/common/package_root.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/common/package_root.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample_one.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample_one.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample_one.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample_one.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample_two.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample_two.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample_two.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_org_sample_two.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_root.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_root.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_org_sample.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_org_sample.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_org_sample.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_org_sample.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_org_sample_two.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_org_sample_two.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_org_sample_two.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_org_sample_two.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_root.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_root.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_org_sample_one.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_org_sample_one.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_org_sample_one.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_org_sample_one.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_org_sample_two.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_org_sample_two.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_org_sample_two.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_org_sample_two.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_root.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_root.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/commonized/native/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample_one.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample_one.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample_one.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample_one.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample_two.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample_two.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample_two.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_org_sample_two.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_root.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_root.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/js/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_org_sample.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_org_sample.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_org_sample.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_org_sample.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_org_sample_two.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_org_sample_two.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_org_sample_two.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_org_sample_two.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_root.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_root.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_org_sample_one.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_org_sample_one.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_org_sample_one.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_org_sample_one.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_org_sample_two.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_org_sample_two.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_org_sample_two.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_org_sample_two.kt diff --git a/konan/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_root.kt b/native/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_root.kt similarity index 100% rename from konan/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_root.kt rename to native/commonizer/testData/generalCommonization/mismatchedPackages/original/native/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/setters/commonized/common/package_root.kt b/native/commonizer/testData/propertyCommonization/setters/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/setters/commonized/common/package_root.kt rename to native/commonizer/testData/propertyCommonization/setters/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/setters/commonized/js/package_root.kt b/native/commonizer/testData/propertyCommonization/setters/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/setters/commonized/js/package_root.kt rename to native/commonizer/testData/propertyCommonization/setters/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/setters/commonized/jvm/package_root.kt b/native/commonizer/testData/propertyCommonization/setters/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/setters/commonized/jvm/package_root.kt rename to native/commonizer/testData/propertyCommonization/setters/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/setters/original/js/package_root.kt b/native/commonizer/testData/propertyCommonization/setters/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/setters/original/js/package_root.kt rename to native/commonizer/testData/propertyCommonization/setters/original/js/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/setters/original/jvm/package_root.kt b/native/commonizer/testData/propertyCommonization/setters/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/setters/original/jvm/package_root.kt rename to native/commonizer/testData/propertyCommonization/setters/original/jvm/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/specifics/commonized/common/package_root.kt b/native/commonizer/testData/propertyCommonization/specifics/commonized/common/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/specifics/commonized/common/package_root.kt rename to native/commonizer/testData/propertyCommonization/specifics/commonized/common/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/specifics/commonized/js/package_root.kt b/native/commonizer/testData/propertyCommonization/specifics/commonized/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/specifics/commonized/js/package_root.kt rename to native/commonizer/testData/propertyCommonization/specifics/commonized/js/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/specifics/commonized/jvm/package_root.kt b/native/commonizer/testData/propertyCommonization/specifics/commonized/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/specifics/commonized/jvm/package_root.kt rename to native/commonizer/testData/propertyCommonization/specifics/commonized/jvm/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/specifics/original/js/package_root.kt b/native/commonizer/testData/propertyCommonization/specifics/original/js/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/specifics/original/js/package_root.kt rename to native/commonizer/testData/propertyCommonization/specifics/original/js/package_root.kt diff --git a/konan/commonizer/testData/propertyCommonization/specifics/original/jvm/package_root.kt b/native/commonizer/testData/propertyCommonization/specifics/original/jvm/package_root.kt similarity index 100% rename from konan/commonizer/testData/propertyCommonization/specifics/original/jvm/package_root.kt rename to native/commonizer/testData/propertyCommonization/specifics/original/jvm/package_root.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt similarity index 99% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt index 3738bd015e0..6b039b9168a 100644 --- a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt @@ -65,7 +65,7 @@ abstract class AbstractCommonizationFromSourcesTest : KtUsefulTestCase() { val testDir = testDirectoryName return File(getHomeDirectory()) - .resolve("konan/commonizer/testData") + .resolve("native/commonizer/testData") .resolve(testCaseDir) .resolve(testDir) .also(::assertIsDirectory) diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CallableMemberCommonizationFromSourcesTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/ClassifierCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/ClassifierCommonizationFromSourcesTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/ClassifierCommonizationFromSourcesTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/ClassifierCommonizationFromSourcesTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/CommonizerFacadeTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/GeneralCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/GeneralCommonizationFromSourcesTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/GeneralCommonizationFromSourcesTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/GeneralCommonizationFromSourcesTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/PropertyCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/PropertyCommonizationFromSourcesTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/PropertyCommonizationFromSourcesTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/PropertyCommonizationFromSourcesTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/AbstractCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultExtensionReceiverCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultExtensionReceiverCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultExtensionReceiverCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultExtensionReceiverCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultFunctionModifiersCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultFunctionModifiersCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultFunctionModifiersCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultFunctionModifiersCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultModalityCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultModalityCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultModalityCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultModalityCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultModuleCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultModuleCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultModuleCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultModuleCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultPropertySetterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultPropertySetterCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultPropertySetterCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultPropertySetterCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeParameterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeParameterCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeParameterCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeParameterCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeParameterListCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeParameterListCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeParameterListCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultTypeParameterListCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterListCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterListCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterListCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/DefaultValueParameterListCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/EqualizingVisibilityCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/LoweringVisibilityCommonizerTest.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/ComparingDeclarationsVisitor.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/ComparingDeclarationsVisitor.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/ComparingDeclarationsVisitor.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/ComparingDeclarationsVisitor.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/assertions.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/assertions.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/assertions.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/assertions.kt diff --git a/konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt similarity index 100% rename from konan/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt rename to native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt diff --git a/konan/utils/build.gradle.kts b/native/utils/build.gradle.kts similarity index 100% rename from konan/utils/build.gradle.kts rename to native/utils/build.gradle.kts diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/library/NativeLibraryConstants.kt b/native/utils/src/org/jetbrains/kotlin/konan/library/NativeLibraryConstants.kt similarity index 100% rename from konan/utils/src/org/jetbrains/kotlin/konan/library/NativeLibraryConstants.kt rename to native/utils/src/org/jetbrains/kotlin/konan/library/NativeLibraryConstants.kt diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt similarity index 100% rename from konan/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt similarity index 100% rename from konan/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt rename to native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/util/DependencyDirectories.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/DependencyDirectories.kt similarity index 100% rename from konan/utils/src/org/jetbrains/kotlin/konan/util/DependencyDirectories.kt rename to native/utils/src/org/jetbrains/kotlin/konan/util/DependencyDirectories.kt diff --git a/konan/utils/src/org/jetbrains/kotlin/konan/util/VisibleNamed.kt b/native/utils/src/org/jetbrains/kotlin/konan/util/VisibleNamed.kt similarity index 100% rename from konan/utils/src/org/jetbrains/kotlin/konan/util/VisibleNamed.kt rename to native/utils/src/org/jetbrains/kotlin/konan/util/VisibleNamed.kt diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 865fe36efa1..105b1b4d884 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index ff91b30efea..2e66912cad6 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } testRuntime(project(":kotlin-reflect")) testRuntime(project(":idea:idea-android")) testRuntime(project(":idea:idea-gradle")) diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index d25642ae4ca..046e7015a36 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -65,7 +65,7 @@ val projectsToShadow by extra(listOf( ":js:js.parser", ":js:js.serializer", ":js:js.translator", - ":kotlin-native:kotlin-native-utils", + ":native:kotlin-native-utils", ":native:frontend.native", ":kotlin-gradle-statistics", ":compiler:light-classes", diff --git a/settings.gradle b/settings.gradle index c0e7baa0bb7..b64345eb8e4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -124,9 +124,9 @@ include ":kotlin-build-common", ":js:js.translator", ":js:js.dce", ":js:js.tests", - ":kotlin-native:kotlin-native-utils", + ":native:kotlin-native-utils", ":native:frontend.native", - ":kotlin-native:commonizer", + ":native:kotlin-native-commonizer", ":jps-plugin", ":kotlin-jps-plugin", ":core:descriptors", @@ -405,9 +405,9 @@ project(':kotlin-stdlib-js-ir').projectDir = "$rootDir/libraries/stdlib/js-ir" a project(':kotlin-util-io').projectDir = "$rootDir/compiler/util-io" as File project(':kotlin-util-klib').projectDir = "$rootDir/compiler/util-klib" as File project(':kotlin-util-klib-metadata').projectDir = "$rootDir/compiler/util-klib-metadata" as File -project(':kotlin-native:kotlin-native-utils').projectDir = "$rootDir/konan/utils" as File +project(':native:kotlin-native-utils').projectDir = "$rootDir/native/utils" as File project(':native:frontend.native').projectDir = "$rootDir/native/frontend" as File -project(':kotlin-native:commonizer').projectDir = "$rootDir/konan/commonizer" as File +project(':native:kotlin-native-commonizer').projectDir = "$rootDir/native/commonizer" as File project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File project(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File project(':plugins:android-extensions-compiler').projectDir = "$rootDir/plugins/android-extensions/android-extensions-compiler" as File