[EXPERIMENT] Rename to 'base' and 'objcexport-header-generator'
diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle
index 1f252d4..e0512cd 100644
--- a/kotlin-native/backend.native/build.gradle
+++ b/kotlin-native/backend.native/build.gradle
@@ -157,8 +157,8 @@
kotlin_script_runtime_jar project(":kotlin-script-runtime")
compilerApi project(":kotlin-native:utilities:basic-utils")
- compilerApi project(":kotlin-native:objcexport")
- compilerApi project(":kotlin-native:model")
+ compilerApi project(":kotlin-native:objcexport-header-generator")
+ compilerApi project(":kotlin-native:base")
compilerImplementation project(":kotlin-compiler")
compilerApi project(":native:kotlin-native-utils")
diff --git a/kotlin-native/model/build.gradle.kts b/kotlin-native/base/build.gradle.kts
similarity index 100%
rename from kotlin-native/model/build.gradle.kts
rename to kotlin-native/base/build.gradle.kts
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AllocationMode.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AllocationMode.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AllocationMode.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AllocationMode.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AndroidProgramType.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AndroidProgramType.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AndroidProgramType.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AndroidProgramType.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AppStateTracking.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AppStateTracking.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AppStateTracking.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/AppStateTracking.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/BinaryOptions.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/BinaryOptions.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/BinaryOptions.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/BinaryOptions.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/BinaryType.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/BinaryType.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/BinaryType.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/BinaryType.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/DestroyRuntimeMode.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/DestroyRuntimeMode.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/DestroyRuntimeMode.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/DestroyRuntimeMode.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Exceptions.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Exceptions.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Exceptions.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Exceptions.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Freezing.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Freezing.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Freezing.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Freezing.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/GC.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/GC.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/GC.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/GC.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/GCSchedulerType.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/GCSchedulerType.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/GCSchedulerType.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/GCSchedulerType.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InlineClasses.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InlineClasses.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InternalKonanApi.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InternalKonanApi.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InternalKonanApi.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InternalKonanApi.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InteropUtils.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InteropUtils.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InteropUtils.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/InteropUtils.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/KonanFqNames.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/KonanFqNames.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/KonanFqNames.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/KonanFqNames.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/LlvmVariant.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/LlvmVariant.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/LlvmVariant.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/LlvmVariant.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/MemoryModel.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/MemoryModel.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/MemoryModel.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/MemoryModel.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ObjCExportSuspendFunctionLaunchThreadRestriction.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ObjCExportSuspendFunctionLaunchThreadRestriction.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ObjCExportSuspendFunctionLaunchThreadRestriction.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ObjCExportSuspendFunctionLaunchThreadRestriction.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Reporting.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Reporting.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Reporting.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/Reporting.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeAssertsMode.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeAssertsMode.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeAssertsMode.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeAssertsMode.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeLinkageStrategyBinaryOption.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeLinkageStrategyBinaryOption.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeLinkageStrategyBinaryOption.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeLinkageStrategyBinaryOption.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeLogging.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeLogging.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeLogging.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/RuntimeLogging.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/SourceInfoType.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/SourceInfoType.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/SourceInfoType.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/SourceInfoType.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/TestRunnerKind.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/TestRunnerKind.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/TestRunnerKind.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/TestRunnerKind.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/UnitSuspendFunctionObjCExport.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/UnitSuspendFunctionObjCExport.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/UnitSuspendFunctionObjCExport.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/UnitSuspendFunctionObjCExport.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/WorkerExceptionHandling.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/WorkerExceptionHandling.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/WorkerExceptionHandling.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/WorkerExceptionHandling.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/cKeywords.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/cKeywords.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/cKeywords.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/cKeywords.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/descriptors/LegacyDescriptorUtils.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/getCompilerMessageLocation.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/getCompilerMessageLocation.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/getCompilerMessageLocation.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/getCompilerMessageLocation.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ir/irUtils.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ir/irUtils.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ir/irUtils.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/ir/irUtils.kt
diff --git a/kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttribute.kt b/kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttribute.kt
similarity index 100%
rename from kotlin-native/model/src/main/kotlin/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttribute.kt
rename to kotlin-native/base/src/main/kotlin/org/jetbrains/kotlin/backend/konan/llvm/LlvmAttribute.kt
diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
index f57d069..8f2c81f 100644
--- a/kotlin-native/build.gradle
+++ b/kotlin-native/build.gradle
@@ -165,7 +165,7 @@
distPack project(':kotlin-native:Interop:StubGenerator')
distPack project(':kotlin-native:Interop:Skia')
distPack project(':kotlin-native:backend.native')
- distPack project(':kotlin-native:objcexport')
+ distPack project(':kotlin-native:objcexport-header-generator')
distPack project(':kotlin-native:utilities:cli-runner')
distPack project(':kotlin-native:utilities:basic-utils')
distPack project(':kotlin-native:klib')
diff --git a/kotlin-native/objcexport/.editorconfig b/kotlin-native/objcexport-header-generator/.editorconfig
similarity index 100%
rename from kotlin-native/objcexport/.editorconfig
rename to kotlin-native/objcexport-header-generator/.editorconfig
diff --git a/kotlin-native/objcexport/build.gradle.kts b/kotlin-native/objcexport-header-generator/build.gradle.kts
similarity index 92%
rename from kotlin-native/objcexport/build.gradle.kts
rename to kotlin-native/objcexport-header-generator/build.gradle.kts
index fd1e118..c597ba8 100644
--- a/kotlin-native/objcexport/build.gradle.kts
+++ b/kotlin-native/objcexport-header-generator/build.gradle.kts
@@ -15,7 +15,7 @@
implementation(project(":compiler:ir.tree"))
implementation(project(":core:compiler.common.native"))
implementation(project(":core:descriptors"))
- implementation(project(":kotlin-native:model"))
+ implementation(project(":kotlin-native:base"))
implementation(project(":native:kotlin-native-utils"))
testImplementation(libs.junit.jupiter.api)
@@ -36,5 +36,6 @@
useJUnitPlatform()
dependsOn(":kotlin-native:dist")
systemProperty("org.jetbrains.kotlin.native.home", kotlinNativeDist.canonicalPath)
+ systemProperty("projectDir", projectDir.absolutePath)
workingDir(rootProject.projectDir)
}
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/CustomTypeMapper.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/CustomTypeMapper.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/CustomTypeMapper.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/CustomTypeMapper.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/MainPackageGuesser.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/MainPackageGuesser.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/MainPackageGuesser.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/MainPackageGuesser.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/MethodBridge.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/MethodBridge.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/MethodBridge.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/MethodBridge.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ModuleMapBuilder.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ModuleMapBuilder.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ModuleMapBuilder.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ModuleMapBuilder.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportCodeSpec.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazyUtils.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazyUtils.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazyUtils.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazyUtils.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportMapper.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportScope.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportScope.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportScope.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportScope.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportTranslatorMobile.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportTranslatorMobile.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportTranslatorMobile.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportTranslatorMobile.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedInterface.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedInterface.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedInterface.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedInterface.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedStubs.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedStubs.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedStubs.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportedStubs.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCHeaderWriter.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCHeaderWriter.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCHeaderWriter.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjCHeaderWriter.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjcExportHeaderGeneratorMobile.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjcExportHeaderGeneratorMobile.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjcExportHeaderGeneratorMobile.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/ObjcExportHeaderGeneratorMobile.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/StubBuilder.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/StubBuilder.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/StubBuilder.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/StubBuilder.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/StubRenderer.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/StubRenderer.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/StubRenderer.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/StubRenderer.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/objcTypes.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/objcTypes.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/objcTypes.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/objcTypes.kt
diff --git a/kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt b/kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt
similarity index 100%
rename from kotlin-native/objcexport/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt
rename to kotlin-native/objcexport-header-generator/src/main/kotlin/org/jetbrains/kotlin/backend/konan/objcexport/stubs.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/AbstractObjCExportHeaderGeneratorTest.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/AbstractObjCExportHeaderGeneratorTest.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/AbstractObjCExportHeaderGeneratorTest.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/AbstractObjCExportHeaderGeneratorTest.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/Fe10ObjCExportHeaderGenerator.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/Fe10ObjCExportHeaderGenerator.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/Fe10ObjCExportHeaderGenerator.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/Fe10ObjCExportHeaderGenerator.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/Fe10Utils.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/Fe10Utils.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/Fe10Utils.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/Fe10Utils.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/InlineSourceTestEnvironment.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/InlineSourceTestEnvironment.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/InlineSourceTestEnvironment.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/InlineSourceTestEnvironment.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/ObjCExportUtils.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/ObjCExportUtils.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/ObjCExportUtils.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/ObjCExportUtils.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/konanHome.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/konanHome.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/konanHome.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/konanHome.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/testDataDir.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/testDataDir.kt
similarity index 85%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/testDataDir.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/testDataDir.kt
index 64f7c8b..8a7e32c 100644
--- a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/testDataDir.kt
+++ b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/testUtils/testDataDir.kt
@@ -7,5 +7,5 @@
import java.io.File
-val projectDir = File("kotlin-native/objcexport")
+val projectDir = File(System.getProperty("projectDir"))
val testDataDir = projectDir.resolve("src/test/testData")
\ No newline at end of file
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/Fe10ObjCExportHeaderGeneratorTest.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/Fe10ObjCExportHeaderGeneratorTest.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/Fe10ObjCExportHeaderGeneratorTest.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/Fe10ObjCExportHeaderGeneratorTest.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/ObjCExportMapperTest.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/ObjCExportMapperTest.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/ObjCExportMapperTest.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/ObjCExportMapperTest.kt
diff --git a/kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/ObjCExportNamerTest.kt b/kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/ObjCExportNamerTest.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/ObjCExportNamerTest.kt
rename to kotlin-native/objcexport-header-generator/src/test/kotlin/org/jetbrains/kotlin/backend/konan/tests/ObjCExportNamerTest.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/classImplementingInterface/\041classImplementingInterface.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classImplementingInterface/\041classImplementingInterface.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/classImplementingInterface/\041classImplementingInterface.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classImplementingInterface/\041classImplementingInterface.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/classImplementingInterface/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classImplementingInterface/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/classImplementingInterface/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classImplementingInterface/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/classWithHidesFromObjCAnnotation/\041classWithHidesFromObjCAnnotation.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithHidesFromObjCAnnotation/\041classWithHidesFromObjCAnnotation.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/classWithHidesFromObjCAnnotation/\041classWithHidesFromObjCAnnotation.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithHidesFromObjCAnnotation/\041classWithHidesFromObjCAnnotation.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/classWithHidesFromObjCAnnotation/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithHidesFromObjCAnnotation/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/classWithHidesFromObjCAnnotation/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithHidesFromObjCAnnotation/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/classWithKDoc/\041classWithKDoc.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithKDoc/\041classWithKDoc.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/classWithKDoc/\041classWithKDoc.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithKDoc/\041classWithKDoc.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/classWithKDoc/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithKDoc/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/classWithKDoc/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithKDoc/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/classWithObjCNameAnnotation/\041classWithObjCNameAnnotation.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithObjCNameAnnotation/\041classWithObjCNameAnnotation.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/classWithObjCNameAnnotation/\041classWithObjCNameAnnotation.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithObjCNameAnnotation/\041classWithObjCNameAnnotation.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/classWithObjCNameAnnotation/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithObjCNameAnnotation/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/classWithObjCNameAnnotation/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/classWithObjCNameAnnotation/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/functionWithErrorType/\041functionWithErrorType.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithErrorType/\041functionWithErrorType.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/functionWithErrorType/\041functionWithErrorType.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithErrorType/\041functionWithErrorType.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/functionWithErrorType/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithErrorType/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/functionWithErrorType/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithErrorType/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/functionWithObjCNameAnnotation/\041functionWithObjCNameAnnotation.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithObjCNameAnnotation/\041functionWithObjCNameAnnotation.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/functionWithObjCNameAnnotation/\041functionWithObjCNameAnnotation.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithObjCNameAnnotation/\041functionWithObjCNameAnnotation.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/functionWithObjCNameAnnotation/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithObjCNameAnnotation/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/functionWithObjCNameAnnotation/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithObjCNameAnnotation/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/functionWithThrowsAnnotation/\041functionWithThrowsAnnotation.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithThrowsAnnotation/\041functionWithThrowsAnnotation.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/functionWithThrowsAnnotation/\041functionWithThrowsAnnotation.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithThrowsAnnotation/\041functionWithThrowsAnnotation.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/functionWithThrowsAnnotation/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithThrowsAnnotation/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/functionWithThrowsAnnotation/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/functionWithThrowsAnnotation/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/interfaceImplementingInterface/\041interfaceImplementingInterface.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/interfaceImplementingInterface/\041interfaceImplementingInterface.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/interfaceImplementingInterface/\041interfaceImplementingInterface.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/interfaceImplementingInterface/\041interfaceImplementingInterface.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/interfaceImplementingInterface/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/interfaceImplementingInterface/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/interfaceImplementingInterface/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/interfaceImplementingInterface/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/sameClassNameInDifferentPackage/\041sameClassNameInDifferentPackage.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/sameClassNameInDifferentPackage/\041sameClassNameInDifferentPackage.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/sameClassNameInDifferentPackage/\041sameClassNameInDifferentPackage.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/sameClassNameInDifferentPackage/\041sameClassNameInDifferentPackage.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/sameClassNameInDifferentPackage/a/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/sameClassNameInDifferentPackage/a/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/sameClassNameInDifferentPackage/a/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/sameClassNameInDifferentPackage/a/Foo.kt
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/sameClassNameInDifferentPackage/b/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/sameClassNameInDifferentPackage/b/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/sameClassNameInDifferentPackage/b/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/sameClassNameInDifferentPackage/b/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/samePropertyAndFunctionName/\041samePropertyAndFunctionName.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/samePropertyAndFunctionName/\041samePropertyAndFunctionName.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/samePropertyAndFunctionName/\041samePropertyAndFunctionName.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/samePropertyAndFunctionName/\041samePropertyAndFunctionName.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/samePropertyAndFunctionName/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/samePropertyAndFunctionName/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/samePropertyAndFunctionName/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/samePropertyAndFunctionName/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/simpleClass/\041simpleClass.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleClass/\041simpleClass.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/simpleClass/\041simpleClass.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleClass/\041simpleClass.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/simpleClass/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleClass/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/simpleClass/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleClass/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/simpleEnumClass/\041simpleEnumClass.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleEnumClass/\041simpleEnumClass.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/simpleEnumClass/\041simpleEnumClass.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleEnumClass/\041simpleEnumClass.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/simpleEnumClass/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleEnumClass/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/simpleEnumClass/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleEnumClass/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/simpleInterface/\041simpleInterface.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleInterface/\041simpleInterface.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/simpleInterface/\041simpleInterface.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleInterface/\041simpleInterface.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/simpleInterface/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleInterface/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/simpleInterface/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleInterface/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/simpleObject/\041simpleObject.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleObject/\041simpleObject.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/simpleObject/\041simpleObject.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleObject/\041simpleObject.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/simpleObject/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleObject/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/simpleObject/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/simpleObject/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/topLevelFunction/\041topLevelFunction.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/topLevelFunction/\041topLevelFunction.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/topLevelFunction/\041topLevelFunction.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/topLevelFunction/\041topLevelFunction.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/topLevelFunction/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/topLevelFunction/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/topLevelFunction/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/topLevelFunction/Foo.kt
diff --git "a/kotlin-native/objcexport/src/test/testData/objcexport/topLevelProperty/\041topLevelProperty.h" "b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/topLevelProperty/\041topLevelProperty.h"
similarity index 100%
rename from "kotlin-native/objcexport/src/test/testData/objcexport/topLevelProperty/\041topLevelProperty.h"
rename to "kotlin-native/objcexport-header-generator/src/test/testData/objcexport/topLevelProperty/\041topLevelProperty.h"
diff --git a/kotlin-native/objcexport/src/test/testData/objcexport/topLevelProperty/Foo.kt b/kotlin-native/objcexport-header-generator/src/test/testData/objcexport/topLevelProperty/Foo.kt
similarity index 100%
rename from kotlin-native/objcexport/src/test/testData/objcexport/topLevelProperty/Foo.kt
rename to kotlin-native/objcexport-header-generator/src/test/testData/objcexport/topLevelProperty/Foo.kt
diff --git a/settings.gradle b/settings.gradle
index b1ddd23..ca0f125 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -838,8 +838,8 @@
include ':kotlin-native:endorsedLibraries:kotlinx.cli'
include ':kotlin-native:Interop:StubGenerator'
include ':kotlin-native:backend.native'
- include ':kotlin-native:model'
- include ':kotlin-native:objcexport'
+ include ':kotlin-native:base'
+ include ':kotlin-native:objcexport-header-generator'
include ':kotlin-native:Interop:Runtime'
include ':kotlin-native:Interop:Indexer'
include ':kotlin-native:Interop:JsRuntime'
