From 9f0a6537bb399a148b6f2f4a34817f7526853be7 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Fri, 1 Mar 2024 22:15:28 +0100 Subject: [PATCH] [K/N] Convert :kotlin-native:Interop:StubGenerator Use folder structure from the rest of the project and build it by the bootstrap compiler. --- .../Interop/StubGenerator/build.gradle.kts | 36 ++++--------------- .../kotlin/native/interop/gen/AbiSpecific.kt | 0 .../native/interop/gen/CWrapperGenerator.kt | 0 .../kotlin/native/interop/gen/CodeBuilders.kt | 0 .../kotlin/native/interop/gen/CodeUtils.kt | 0 .../interop/gen/DeepCopyForManagedWrapper.kt | 0 .../interop/gen/ExceptionPrettifiers.kt | 0 .../kotlin/native/interop/gen/Imports.kt | 0 .../native/interop/gen/KotlinCodeModel.kt | 0 .../kotlin/native/interop/gen/LibraryUtils.kt | 0 .../interop/gen/MappingBridgeGenerator.kt | 0 .../interop/gen/MappingBridgeGeneratorImpl.kt | 0 .../kotlin/native/interop/gen/Mappings.kt | 0 .../kotlin/native/interop/gen/ObjCStubs.kt | 0 .../interop/gen/SimpleBridgeGenerator.kt | 0 .../interop/gen/SimpleBridgeGeneratorImpl.kt | 0 .../native/interop/gen/StructRendering.kt | 0 .../kotlin/native/interop/gen/StubIr.kt | 0 .../native/interop/gen/StubIrBridgeBuilder.kt | 0 .../native/interop/gen/StubIrBuilder.kt | 0 .../kotlin/native/interop/gen/StubIrDriver.kt | 0 .../interop/gen/StubIrElementBuilders.kt | 0 .../native/interop/gen/StubIrExtensions.kt | 0 .../interop/gen/StubIrMetadataEmitter.kt | 0 .../native/interop/gen/StubIrTextEmitter.kt | 0 .../kotlin/native/interop/gen/StubIrType.kt | 0 .../native/interop/gen/StubIrVisitor.kt | 0 .../kotlin/native/interop/gen/TypeUtils.kt | 0 .../native/interop/gen/defFileDependencies.kt | 0 .../native/interop/gen/jvm/CommandLine.kt | 0 .../native/interop/gen/jvm/GenerationMode.kt | 0 .../interop/gen/jvm/InteropConfiguration.kt | 0 .../interop/gen/jvm/InteropLibraryCreation.kt | 0 .../kotlin/native/interop/gen/jvm/Plugins.kt | 0 .../native/interop/gen/jvm/ToolConfig.kt | 0 .../kotlin/native/interop/gen/jvm/main.kt | 0 .../native/interop/gen/ExcludeFilterTests.kt | 0 .../interop/gen/ForwardDeclarationsTests.kt | 0 .../interop/gen/IncludeCategoriesTests.kt | 0 .../native/interop/gen/InteropTestsBase.kt | 0 .../interop/gen/ObjCMethodSignaturesTest.kt | 0 .../interop/gen/StructRenderingTests.kt | 0 .../interop/gen/StubIrToMetadataTests.kt | 0 .../ForwardDeclarations/objc/dependency.def | 0 .../ForwardDeclarations/objc/dependency.h | 0 .../ForwardDeclarations/objc/imported.h | 0 .../ForwardDeclarations/objc/included.h | 0 .../ForwardDeclarations/objc/main.def | 0 .../ForwardDeclarations/objc/main.h | 0 .../objcWithDefinition/included.h | 0 .../objcWithDefinition/main.def | 0 .../objcWithDefinition/main.h | 0 .../ForwardDeclarations/struct/dependency.def | 0 .../ForwardDeclarations/struct/dependency.h | 0 .../ForwardDeclarations/struct/imported.h | 0 .../ForwardDeclarations/struct/included.h | 0 .../ForwardDeclarations/struct/main.def | 0 .../ForwardDeclarations/struct/main.h | 0 .../structWithDefinition/included.h | 0 .../structWithDefinition/main.def | 0 .../structWithDefinition/main.h | 0 .../IncludeCategories/header1.h | 0 .../IncludeCategories/header2.h | 0 .../IncludeCategories/includeCategory0.def | 0 .../IncludeCategories/includeCategory1.def | 0 .../IncludeCategories/includeCategory2.def | 0 66 files changed, 6 insertions(+), 30 deletions(-) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/AbiSpecific.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/CWrapperGenerator.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/CodeBuilders.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/CodeUtils.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/DeepCopyForManagedWrapper.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/ExceptionPrettifiers.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/Imports.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/LibraryUtils.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGenerator.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGeneratorImpl.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/Mappings.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/ObjCStubs.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGenerator.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGeneratorImpl.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StructRendering.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIr.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrBridgeBuilder.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrBuilder.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrDriver.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrElementBuilders.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrExtensions.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrType.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/StubIrVisitor.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/TypeUtils.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/jvm/GenerationMode.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/jvm/InteropConfiguration.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/jvm/Plugins.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt (100%) rename kotlin-native/Interop/StubGenerator/src/{main/kotlin => }/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt (100%) rename kotlin-native/Interop/StubGenerator/{src/test/kotlin => test}/org/jetbrains/kotlin/native/interop/gen/ExcludeFilterTests.kt (100%) rename kotlin-native/Interop/StubGenerator/{src/test/kotlin => test}/org/jetbrains/kotlin/native/interop/gen/ForwardDeclarationsTests.kt (100%) rename kotlin-native/Interop/StubGenerator/{src/test/kotlin => test}/org/jetbrains/kotlin/native/interop/gen/IncludeCategoriesTests.kt (100%) rename kotlin-native/Interop/StubGenerator/{src/test/kotlin => test}/org/jetbrains/kotlin/native/interop/gen/InteropTestsBase.kt (100%) rename kotlin-native/Interop/StubGenerator/{src/test/kotlin => test}/org/jetbrains/kotlin/native/interop/gen/ObjCMethodSignaturesTest.kt (100%) rename kotlin-native/Interop/StubGenerator/{src/test/kotlin => test}/org/jetbrains/kotlin/native/interop/gen/StructRenderingTests.kt (100%) rename kotlin-native/Interop/StubGenerator/{src/test/kotlin => test}/org/jetbrains/kotlin/native/interop/gen/StubIrToMetadataTests.kt (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objc/dependency.def (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objc/dependency.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objc/imported.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objc/included.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objc/main.def (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objc/main.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objcWithDefinition/included.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objcWithDefinition/main.def (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/objcWithDefinition/main.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/struct/dependency.def (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/struct/dependency.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/struct/imported.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/struct/included.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/struct/main.def (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/struct/main.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/structWithDefinition/included.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/structWithDefinition/main.def (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/ForwardDeclarations/structWithDefinition/main.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/IncludeCategories/header1.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/IncludeCategories/header2.h (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/IncludeCategories/includeCategory0.def (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/IncludeCategories/includeCategory1.def (100%) rename kotlin-native/Interop/StubGenerator/{src/test/resources => testResources}/IncludeCategories/includeCategory2.def (100%) diff --git a/kotlin-native/Interop/StubGenerator/build.gradle.kts b/kotlin-native/Interop/StubGenerator/build.gradle.kts index ec5de8c121f..4123f704e25 100644 --- a/kotlin-native/Interop/StubGenerator/build.gradle.kts +++ b/kotlin-native/Interop/StubGenerator/build.gradle.kts @@ -1,25 +1,3 @@ -import org.jetbrains.kotlin.config.AnalysisFlags.optIn - -/* - * Copyright 2010-2022 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -buildscript { - apply(from = "$rootDir/kotlin-native/gradle/kotlinGradlePlugin.gradle") -} - plugins { kotlin("jvm") application @@ -34,7 +12,7 @@ dependencies { implementation(project(":kotlin-native:Interop:Indexer")) implementation(project(path = ":kotlin-native:endorsedLibraries:kotlinx.cli", configuration = "jvmRuntimeElements")) - api(project(":kotlin-stdlib")) + api(kotlinStdlib()) implementation(project(":kotlinx-metadata-klib")) implementation(project(":native:kotlin-native-utils")) implementation(project(":compiler:util")) @@ -43,14 +21,12 @@ dependencies { testImplementation(kotlinTest("junit")) } -tasks { - withType> { - compilerOptions { - optIn.add("kotlin.ExperimentalUnsignedTypes") - freeCompilerArgs.add("-Xskip-metadata-version-check") - } - } +sourceSets { + "main" { projectDefault() } + "test" { projectDefault() } +} +tasks { // Copy-pasted from Indexer build.gradle.kts. withType().configureEach { val projectsWithNativeLibs = listOf( diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/AbiSpecific.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/AbiSpecific.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/AbiSpecific.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/AbiSpecific.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/CWrapperGenerator.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/CWrapperGenerator.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/CWrapperGenerator.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/CWrapperGenerator.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/CodeBuilders.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/CodeBuilders.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/CodeBuilders.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/CodeBuilders.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/CodeUtils.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/CodeUtils.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/CodeUtils.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/CodeUtils.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/DeepCopyForManagedWrapper.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/DeepCopyForManagedWrapper.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/DeepCopyForManagedWrapper.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/DeepCopyForManagedWrapper.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/ExceptionPrettifiers.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/ExceptionPrettifiers.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/ExceptionPrettifiers.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/ExceptionPrettifiers.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/Imports.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/Imports.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/Imports.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/Imports.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/KotlinCodeModel.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/LibraryUtils.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/LibraryUtils.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/LibraryUtils.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/LibraryUtils.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGenerator.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGenerator.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGenerator.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGenerator.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGeneratorImpl.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGeneratorImpl.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGeneratorImpl.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/MappingBridgeGeneratorImpl.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/Mappings.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/Mappings.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/Mappings.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/Mappings.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/ObjCStubs.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/ObjCStubs.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/ObjCStubs.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/ObjCStubs.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGenerator.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGenerator.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGenerator.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGenerator.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGeneratorImpl.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGeneratorImpl.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGeneratorImpl.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/SimpleBridgeGeneratorImpl.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StructRendering.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StructRendering.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StructRendering.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StructRendering.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIr.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIr.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIr.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIr.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrBridgeBuilder.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrBridgeBuilder.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrBridgeBuilder.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrBridgeBuilder.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrBuilder.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrBuilder.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrBuilder.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrBuilder.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrDriver.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrDriver.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrDriver.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrDriver.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrElementBuilders.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrElementBuilders.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrElementBuilders.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrElementBuilders.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrExtensions.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrExtensions.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrExtensions.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrExtensions.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrTextEmitter.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrType.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrType.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrType.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrType.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrVisitor.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrVisitor.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrVisitor.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/StubIrVisitor.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/TypeUtils.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/TypeUtils.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/TypeUtils.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/TypeUtils.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/GenerationMode.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/GenerationMode.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/GenerationMode.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/GenerationMode.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropConfiguration.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/InteropConfiguration.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropConfiguration.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/InteropConfiguration.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/Plugins.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/Plugins.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/Plugins.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/Plugins.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt rename to kotlin-native/Interop/StubGenerator/src/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt diff --git a/kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/ExcludeFilterTests.kt b/kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/ExcludeFilterTests.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/ExcludeFilterTests.kt rename to kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/ExcludeFilterTests.kt diff --git a/kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/ForwardDeclarationsTests.kt b/kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/ForwardDeclarationsTests.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/ForwardDeclarationsTests.kt rename to kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/ForwardDeclarationsTests.kt diff --git a/kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/IncludeCategoriesTests.kt b/kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/IncludeCategoriesTests.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/IncludeCategoriesTests.kt rename to kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/IncludeCategoriesTests.kt diff --git a/kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/InteropTestsBase.kt b/kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/InteropTestsBase.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/InteropTestsBase.kt rename to kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/InteropTestsBase.kt diff --git a/kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/ObjCMethodSignaturesTest.kt b/kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/ObjCMethodSignaturesTest.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/ObjCMethodSignaturesTest.kt rename to kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/ObjCMethodSignaturesTest.kt diff --git a/kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/StructRenderingTests.kt b/kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/StructRenderingTests.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/StructRenderingTests.kt rename to kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/StructRenderingTests.kt diff --git a/kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrToMetadataTests.kt b/kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/StubIrToMetadataTests.kt similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrToMetadataTests.kt rename to kotlin-native/Interop/StubGenerator/test/org/jetbrains/kotlin/native/interop/gen/StubIrToMetadataTests.kt diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/dependency.def b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/dependency.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/dependency.def rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/dependency.def diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/dependency.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/dependency.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/dependency.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/dependency.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/imported.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/imported.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/imported.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/imported.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/included.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/included.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/included.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/included.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/main.def b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/main.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/main.def rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/main.def diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/main.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/main.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objc/main.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objc/main.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objcWithDefinition/included.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objcWithDefinition/included.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objcWithDefinition/included.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objcWithDefinition/included.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objcWithDefinition/main.def b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objcWithDefinition/main.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objcWithDefinition/main.def rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objcWithDefinition/main.def diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objcWithDefinition/main.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objcWithDefinition/main.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/objcWithDefinition/main.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/objcWithDefinition/main.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/dependency.def b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/dependency.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/dependency.def rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/dependency.def diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/dependency.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/dependency.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/dependency.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/dependency.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/imported.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/imported.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/imported.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/imported.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/included.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/included.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/included.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/included.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/main.def b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/main.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/main.def rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/main.def diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/main.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/main.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/struct/main.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/struct/main.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/structWithDefinition/included.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/structWithDefinition/included.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/structWithDefinition/included.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/structWithDefinition/included.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/structWithDefinition/main.def b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/structWithDefinition/main.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/structWithDefinition/main.def rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/structWithDefinition/main.def diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/structWithDefinition/main.h b/kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/structWithDefinition/main.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/ForwardDeclarations/structWithDefinition/main.h rename to kotlin-native/Interop/StubGenerator/testResources/ForwardDeclarations/structWithDefinition/main.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/header1.h b/kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/header1.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/header1.h rename to kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/header1.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/header2.h b/kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/header2.h similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/header2.h rename to kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/header2.h diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/includeCategory0.def b/kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/includeCategory0.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/includeCategory0.def rename to kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/includeCategory0.def diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/includeCategory1.def b/kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/includeCategory1.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/includeCategory1.def rename to kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/includeCategory1.def diff --git a/kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/includeCategory2.def b/kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/includeCategory2.def similarity index 100% rename from kotlin-native/Interop/StubGenerator/src/test/resources/IncludeCategories/includeCategory2.def rename to kotlin-native/Interop/StubGenerator/testResources/IncludeCategories/includeCategory2.def