diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml index 67773a4f97a..38fedd07e2b 100644 --- a/.idea/artifacts/KotlinPlugin.xml +++ b/.idea/artifacts/KotlinPlugin.xml @@ -57,7 +57,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index a372392662f..25deb736d30 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,7 @@ - + diff --git a/build.xml b/build.xml index 968b3be1a80..24113d25452 100644 --- a/build.xml +++ b/build.xml @@ -719,15 +719,15 @@ - - - - + + + + - + @@ -737,10 +737,10 @@ - - + + - + @@ -1074,11 +1074,11 @@ depends="builtins,stdlib,kotlin-test,core,reflection,pack-runtime,pack-runtime-sources,mock-runtime-for-test"/> - + @@ -30,4 +30,4 @@ - + \ No newline at end of file diff --git a/generators/generators.iml b/generators/generators.iml index 36ad805cfc5..271f9a73a67 100644 --- a/generators/generators.iml +++ b/generators/generators.iml @@ -24,7 +24,7 @@ - + diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 3d07e19d498..e2d86f81bad 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -935,7 +935,7 @@ fun main(args: Array) { } } - testGroup("plugins/android-compiler-plugin/tests", "plugins/android-compiler-plugin/testData") { + testGroup("plugins/android-extensions/android-extensions-compiler/tests", "plugins/android-extensions/android-extensions-compiler/testData") { testClass() { model("descriptors", recursive = false, extension = null) } diff --git a/idea/idea.iml b/idea/idea.iml index 29a43318a37..a156a21a097 100644 --- a/idea/idea.iml +++ b/idea/idea.iml @@ -41,7 +41,7 @@ - + diff --git a/libraries/tools/kotlin-android-extensions/pom.xml b/libraries/tools/kotlin-android-extensions/pom.xml index e06e1a41664..35d7a37821d 100644 --- a/libraries/tools/kotlin-android-extensions/pom.xml +++ b/libraries/tools/kotlin-android-extensions/pom.xml @@ -57,7 +57,7 @@ compile - + @@ -79,7 +79,7 @@ sources - ${basedir}/../../../plugins/android-compiler-plugin/src + ${basedir}/../../../plugins/android-extensions/android-extensions-compiler/src diff --git a/plugins/android-compiler-plugin/android-compiler-plugin.iml b/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml similarity index 100% rename from plugins/android-compiler-plugin/android-compiler-plugin.iml rename to plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml diff --git a/plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/plugins/android-extensions/android-extensions-compiler/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor similarity index 100% rename from plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor rename to plugins/android-extensions/android-extensions-compiler/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor diff --git a/plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar b/plugins/android-extensions/android-extensions-compiler/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar similarity index 100% rename from plugins/android-compiler-plugin/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar rename to plugins/android-extensions/android-extensions-compiler/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidXmlHandler.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidXmlHandler.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidXmlHandler.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidXmlHandler.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidOnDestroyClassBuilderInterceptorExtension.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/descriptors/AndroidSyntheticPackageFragmentDescriptor.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/descriptors/AndroidSyntheticPackageFragmentDescriptor.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/descriptors/AndroidSyntheticPackageFragmentDescriptor.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/descriptors/AndroidSyntheticPackageFragmentDescriptor.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/descriptors/LazySyntheticElementResolveContext.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/descriptors/LazySyntheticElementResolveContext.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/descriptors/LazySyntheticElementResolveContext.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/descriptors/LazySyntheticElementResolveContext.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/descriptors/PredefinedPackageFragmentDescriptor.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/descriptors/PredefinedPackageFragmentDescriptor.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/descriptors/PredefinedPackageFragmentDescriptor.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/descriptors/PredefinedPackageFragmentDescriptor.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecked.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecked.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecked.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecked.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/diagnostic/ErrorsAndroid.java b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/ErrorsAndroid.java similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/diagnostic/ErrorsAndroid.java rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/ErrorsAndroid.java diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidLayoutXmlFileManager.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidLayoutXmlFileManager.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidLayoutXmlFileManager.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidLayoutXmlFileManager.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidLayoutXmlFileManager.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidLayoutXmlFileManager.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidLayoutXmlFileManager.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidLayoutXmlFileManager.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidPackageFragmentProviderExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidPackageFragmentProviderExtension.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidPackageFragmentProviderExtension.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/CliAndroidPackageFragmentProviderExtension.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/androidResources.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/androidResources.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/androidResources.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/androidResources.kt diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/syntheticDescriptorGeneration.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/syntheticDescriptorGeneration.kt similarity index 100% rename from plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/syntheticDescriptorGeneration.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/syntheticDescriptorGeneration.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeActivity.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeActivity.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeActivity.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeActivity.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeAppwidgetPackage.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeAppwidgetPackage.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeAppwidgetPackage.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeAppwidgetPackage.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeContext.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeContext.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeContext.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeContext.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeInputMethodServicePackage.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeInputMethodServicePackage.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeInputMethodServicePackage.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeInputMethodServicePackage.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeOpenglPackage.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeOpenglPackage.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeOpenglPackage.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeOpenglPackage.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeSupportFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeSupportFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeSupportFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeSupportFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeView.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeView.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeView.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeView.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeWebkitPackage.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeWebkitPackage.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeWebkitPackage.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeWebkitPackage.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/FakeWidgets.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeWidgets.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/FakeWidgets.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeWidgets.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/0.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/0.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/0.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/1.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/1.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/1.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/AndroidManifest.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/AndroidManifest.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/AndroidManifest.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/AndroidManifest.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/CustomWidgets.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/CustomWidgets.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/CustomWidgets.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/CustomWidgets.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/0.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/0.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/0.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/1.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/1.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/1.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/AndroidManifest.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/AndroidManifest.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/AndroidManifest.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/AndroidManifest.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/CustomWidgets.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/CustomWidgets.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/CustomWidgets.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/CustomWidgets.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fragment/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/0.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fragment/0.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/0.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fragment/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/1.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fragment/1.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/1.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fragment/AndroidManifest.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/AndroidManifest.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fragment/AndroidManifest.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/AndroidManifest.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fragment/CustomWidgets.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/CustomWidgets.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fragment/CustomWidgets.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/CustomWidgets.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fragment/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/fragment/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/manyWidgets/1.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/1.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/manyWidgets/1.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/AndroidManifest.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/manyWidgets/AndroidManifest.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/AndroidManifest.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/manyWidgets/AndroidManifest.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/manyWidgets/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/manyWidgets/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/0.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/multiFile/0.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/0.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/1.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/multiFile/1.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/1.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/AndroidManifest.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/AndroidManifest.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/multiFile/AndroidManifest.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/AndroidManifest.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/multiFile/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/multiFile/layout/layout1.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/layout/layout1.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/multiFile/layout/layout1.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/layout/layout1.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/0.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/singleFile/0.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/0.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/1.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/singleFile/1.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/1.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/singleFile/AndroidManifest.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/AndroidManifest.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/singleFile/AndroidManifest.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/AndroidManifest.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/singleFile/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/singleFile/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/view/0.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/0.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/view/0.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/0.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/view/1.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/1.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/view/1.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/1.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/android/view/AndroidManifest.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/AndroidManifest.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/view/AndroidManifest.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/AndroidManifest.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/android/view/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/android/view/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/baseClass.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClass/baseClass.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/baseClass.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClass/baseClass.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClass/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClass/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClassFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClassFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/clearCache.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCache/clearCache.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/clearCache.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCache/clearCache.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCache/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCache/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCacheBaseClass/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCacheBaseClass/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctions/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctions/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsView/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsView/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttr/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttr/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTag/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTag/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFile/multiFile.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFile/multiFile.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFile/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFile/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFile/res/layout/layout1.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/res/layout/layout1.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFile/res/layout/layout1.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/res/layout/layout1.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/res/layout/layout1.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/res/layout/layout1.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/res/layout/layout1.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/onDestroyFragment/onDestroyFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/onDestroyFragment/onDestroyFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/onDestroyFragment/onDestroyFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/onDestroyFragment/onDestroyFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/onDestroyFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/onDestroyFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/onDestroyFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/onDestroyFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simple/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simple/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simple/simple.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simple/simple.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragmentProperty/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragmentProperty/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragmentProperty/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragmentProperty/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragmentProperty/simpleFragmentProperty.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragmentProperty/simpleFragmentProperty.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragmentProperty/simpleFragmentProperty.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragmentProperty/simpleFragmentProperty.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/supportExtensionFunctionsFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragment/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragment/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/supportSimpleFragment.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/supportSimpleFragmentProperty.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/supportSimpleFragmentProperty.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/supportSimpleFragmentProperty.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/supportSimpleFragmentProperty.kt diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/viewStub/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/res/layout/layout.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/viewStub/res/layout/layout.xml rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/res/layout/layout.xml diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/viewStub/viewStub.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/viewStub.kt similarity index 100% rename from plugins/android-compiler-plugin/testData/codegen/bytecodeShape/viewStub/viewStub.kt rename to plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/viewStub.kt diff --git a/plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/res/layout/get.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/escapedLayoutName/res/layout/get.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/res/layout/get.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/escapedLayoutName/res/layout/get.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/escapedLayoutName/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/escapedLayoutName/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInAttr/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInAttr/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInAttr/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInAttr/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInTag/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInTag/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInTag/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInTag/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/layoutVariants/res/layout-hdpi/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/layoutVariants/res/layout-hdpi/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/layoutVariants/res/layout-hdpi/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/layoutVariants/res/layout-hdpi/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/layoutVariants/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/layoutVariants/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/layoutVariants/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/layoutVariants/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/layoutVariants/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/layoutVariants/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/layoutVariants/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/layoutVariants/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/multiFile/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/multiFile/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/multiFile/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/multiFile/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/multiFile/res/layout/test1.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/multiFile/res/layout/test1.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/multiFile/res/layout/test1.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/multiFile/res/layout/test1.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/multiFile/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/multiFile/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/multiFile/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/noIds/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/noIds/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/noIds/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/noIds/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/noIds/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/noIds/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/noIds/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/noIds/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/sameIds/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/sameIds/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/sameIds/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/sameIds/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/sameIds/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/sameIds/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/sameIds/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/sameIds/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/severalResDirs/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/severalResDirs/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/severalResDirs/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/severalResDirs/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/severalResDirs/res2/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/severalResDirs/res2/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/severalResDirs/res2/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/severalResDirs/res2/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/severalResDirs/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/severalResDirs/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/severalResDirs/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/severalResDirs/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/singleFile/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/singleFile/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/singleFile/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/singleFile/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/singleFile/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/singleFile/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/singleFile/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/specialTags/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/specialTags/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/specialTags/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/specialTags/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/specialTags/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/specialTags/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/specialTags/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSingleFile/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSingleFile/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSingleFile/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSingleFile/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSpecialTags/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSpecialTags/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSpecialTags/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSpecialTags/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedFqName/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedFqName/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedFqName/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedFqName/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedWidget/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedWidget/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedWidget/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedWidget/result.txt diff --git a/plugins/android-compiler-plugin/testData/descriptors/viewStub/res/layout/test.xml b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/viewStub/res/layout/test.xml similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/viewStub/res/layout/test.xml rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/viewStub/res/layout/test.xml diff --git a/plugins/android-compiler-plugin/testData/descriptors/viewStub/result.txt b/plugins/android-extensions/android-extensions-compiler/testData/descriptors/viewStub/result.txt similarity index 100% rename from plugins/android-compiler-plugin/testData/descriptors/viewStub/result.txt rename to plugins/android-extensions/android-extensions-compiler/testData/descriptors/viewStub/result.txt diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt similarity index 96% rename from plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt rename to plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt index e73c6f9f03c..9ca315a8c4a 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt @@ -65,7 +65,7 @@ abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { } override fun codegenTestBasePath(): String { - return "plugins/android-compiler-plugin/testData/codegen/" + return "plugins/android-extensions/android-extensions-compiler/testData/codegen/" } private fun doMultiFileTest(path: String, additionalFiles: Collection? = null) { @@ -93,7 +93,7 @@ abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { myFiles = CodegenTestFiles.create( myEnvironment!!.project, ArrayUtil.toStringArray(files), - KotlinTestUtils.getHomeDirectory() + "/plugins/android-compiler-plugin/testData" + KotlinTestUtils.getHomeDirectory() + "/plugins/android-extensions/android-extensions-compiler/testData" ) blackBox(); } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt similarity index 100% rename from plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt rename to plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt similarity index 100% rename from plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt rename to plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java similarity index 72% rename from plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java rename to plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java index b4316600b4d..e353428893d 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java +++ b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java @@ -29,104 +29,104 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) public class AndroidBoxTestGenerated extends AbstractAndroidBoxTest { - @TestMetadata("plugins/android-compiler-plugin/testData/codegen/android") + @TestMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Android extends AbstractAndroidBoxTest { public void testAllFilesPresentInAndroid() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-compiler/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("fragment") public void testFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("manyWidgets") public void testManyWidgets() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/manyWidgets/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("singleFile") public void testSingleFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/singleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("view") public void testView() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/view/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/"); doCompileAgainstAndroidSdkTest(fileName); } } - @TestMetadata("plugins/android-compiler-plugin/testData/codegen/android") + @TestMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractAndroidBoxTest { public void testAllFilesPresentInInvoke() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-compiler/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInAttr/"); doFakeInvocationTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fqNameInTag/"); doFakeInvocationTest(fileName); } @TestMetadata("fragment") public void testFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/fragment/"); doFakeInvocationTest(fileName); } @TestMetadata("manyWidgets") public void testManyWidgets() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/manyWidgets/"); doFakeInvocationTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/multiFile/"); doFakeInvocationTest(fileName); } @TestMetadata("singleFile") public void testSingleFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/singleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/singleFile/"); doFakeInvocationTest(fileName); } @TestMetadata("view") public void testView() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/view/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/"); doFakeInvocationTest(fileName); } } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java similarity index 68% rename from plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java rename to plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java index c6cff18042d..1ef6ad48eaf 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java +++ b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java @@ -27,143 +27,143 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape") +@TestMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class AndroidBytecodeShapeTestGenerated extends AbstractAndroidBytecodeShapeTest { public void testAllFilesPresentInBytecodeShape() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/bytecodeShape"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("baseClass") public void testBaseClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClass/"); doTest(fileName); } @TestMetadata("baseClassFragment") public void testBaseClassFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/baseClassFragment/"); doTest(fileName); } @TestMetadata("clearCache") public void testClearCache() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCache/"); doTest(fileName); } @TestMetadata("clearCacheBaseClass") public void testClearCacheBaseClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/clearCacheBaseClass/"); doTest(fileName); } @TestMetadata("extensionFunctions") public void testExtensionFunctions() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctions/"); doTest(fileName); } @TestMetadata("extensionFunctionsFragment") public void testExtensionFunctionsFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsFragment/"); doTest(fileName); } @TestMetadata("extensionFunctionsView") public void testExtensionFunctionsView() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/extensionFunctionsView/"); doTest(fileName); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInAttrFragment") public void testFqNameInAttrFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInAttrFragment/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTag/"); doTest(fileName); } @TestMetadata("fqNameInTagFragment") public void testFqNameInTagFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/fqNameInTagFragment/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFile/"); doTest(fileName); } @TestMetadata("multiFileFragment") public void testMultiFileFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/multiFileFragment/"); doTest(fileName); } @TestMetadata("onDestroyFragment") public void testOnDestroyFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/onDestroyFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/onDestroyFragment/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simple/"); doTest(fileName); } @TestMetadata("simpleFragment") public void testSimpleFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragment/"); doTest(fileName); } @TestMetadata("simpleFragmentProperty") public void testSimpleFragmentProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragmentProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleFragmentProperty/"); doTest(fileName); } @TestMetadata("simpleView") public void testSimpleView() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/"); doTest(fileName); } @TestMetadata("supportExtensionFunctionsFragment") public void testSupportExtensionFunctionsFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/"); doTest(fileName); } @TestMetadata("supportSimpleFragment") public void testSupportSimpleFragment() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragment/"); doTest(fileName); } @TestMetadata("supportSimpleFragmentProperty") public void testSupportSimpleFragmentProperty() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/"); doTest(fileName); } @TestMetadata("viewStub") public void testViewStub() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/viewStub/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/"); doTest(fileName); } } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java similarity index 72% rename from plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java rename to plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java index 980cf8f6e2a..7dc1ee3976f 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java +++ b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java @@ -27,101 +27,101 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("plugins/android-compiler-plugin/testData/descriptors") +@TestMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class AndroidSyntheticPropertyDescriptorTestGenerated extends AbstractAndroidSyntheticPropertyDescriptorTest { public void testAllFilesPresentInDescriptors() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/descriptors"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-extensions/android-extensions-compiler/testData/descriptors"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("escapedLayoutName") public void testEscapedLayoutName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/escapedLayoutName/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/escapedLayoutName/"); doTest(fileName); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/fqNameInTag/"); doTest(fileName); } @TestMetadata("layoutVariants") public void testLayoutVariants() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/layoutVariants/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/layoutVariants/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/multiFile/"); doTest(fileName); } @TestMetadata("noIds") public void testNoIds() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/noIds/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/noIds/"); doTest(fileName); } @TestMetadata("sameIds") public void testSameIds() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/sameIds/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/sameIds/"); doTest(fileName); } @TestMetadata("severalResDirs") public void testSeveralResDirs() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/severalResDirs/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/severalResDirs/"); doTest(fileName); } @TestMetadata("singleFile") public void testSingleFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/singleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/singleFile/"); doTest(fileName); } @TestMetadata("specialTags") public void testSpecialTags() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/specialTags/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/specialTags/"); doTest(fileName); } @TestMetadata("supportSingleFile") public void testSupportSingleFile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/supportSingleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSingleFile/"); doTest(fileName); } @TestMetadata("supportSpecialTags") public void testSupportSpecialTags() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/supportSpecialTags/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/supportSpecialTags/"); doTest(fileName); } @TestMetadata("unresolvedFqName") public void testUnresolvedFqName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/unresolvedFqName/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedFqName/"); doTest(fileName); } @TestMetadata("unresolvedWidget") public void testUnresolvedWidget() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/unresolvedWidget/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/unresolvedWidget/"); doTest(fileName); } @TestMetadata("viewStub") public void testViewStub() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/descriptors/viewStub/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/descriptors/viewStub/"); doTest(fileName); } } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt b/plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt similarity index 100% rename from plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt rename to plugins/android-extensions/android-extensions-compiler/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt diff --git a/plugins/android-idea-plugin/android-idea-plugin.iml b/plugins/android-idea-plugin/android-idea-plugin.iml index c985da62526..fcdcbad5918 100644 --- a/plugins/android-idea-plugin/android-idea-plugin.iml +++ b/plugins/android-idea-plugin/android-idea-plugin.iml @@ -8,7 +8,7 @@ - + diff --git a/plugins/android-jps-plugin/android-jps-plugin.iml b/plugins/android-jps-plugin/android-jps-plugin.iml index 8ba83aeb32c..8ad3bdc606c 100644 --- a/plugins/android-jps-plugin/android-jps-plugin.iml +++ b/plugins/android-jps-plugin/android-jps-plugin.iml @@ -11,7 +11,7 @@ - +