From d2de398d3e003292f4ce78928de45c65b20a8ffd Mon Sep 17 00:00:00 2001 From: Nikita Skvortsov Date: Sun, 23 Mar 2014 14:06:06 +0400 Subject: [PATCH] clearly rename test projects --- .../kotlin/gradle/KotlinAndroidGradleIT.kt | 8 ++++---- .../jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt | 4 ++-- .../testProject/AndroidAlfaProject/settings.gradle | 1 - .../Android}/build.gradle | 2 +- .../Android}/src/main/AndroidManifest.xml | 0 .../gradle/test/androidalfa/MainActivity.java | 0 .../kotlin/gradle/test/androidalfa/MainActivity2.kt | 0 .../src/main/res/drawable-hdpi/ic_launcher.png | Bin .../src/main/res/drawable-mdpi/ic_launcher.png | Bin .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin .../Android}/src/main/res/layout/activity_main.xml | 0 .../Android}/src/main/res/layout/activity_main2.xml | 0 .../Android}/src/main/res/menu/main.xml | 0 .../Android}/src/main/res/menu/main_activity2.xml | 0 .../Android}/src/main/res/values-sw600dp/dimens.xml | 0 .../src/main/res/values-sw720dp-land/dimens.xml | 0 .../Android}/src/main/res/values-v11/styles.xml | 0 .../Android}/src/main/res/values-v14/styles.xml | 0 .../Android}/src/main/res/values/dimens.xml | 0 .../Android}/src/main/res/values/strings.xml | 0 .../Android}/src/main/res/values/styles.xml | 0 .../LibAlfa => AndroidProject/Lib}/build.gradle | 0 .../Lib}/libs/android-support-v4.jar | Bin .../Lib}/src/main/AndroidManifest.xml | 0 .../Lib}/src/main/ic_launcher-web.png | Bin .../test/android/libalfa/LibMainActivity.java | 0 .../Lib}/src/main/kotlin/Foo.kt | 0 .../Lib}/src/main/res/drawable-hdpi/ic_launcher.png | Bin .../Lib}/src/main/res/drawable-mdpi/ic_launcher.png | Bin .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin .../Lib}/src/main/res/layout/lib_activity_main.xml | 0 .../Lib}/src/main/res/menu/lib_main.xml | 0 .../Lib}/src/main/res/values-sw600dp/dimens.xml | 0 .../src/main/res/values-sw720dp-land/dimens.xml | 0 .../Lib}/src/main/res/values-v11/styles.xml | 0 .../Lib}/src/main/res/values-v14/styles.xml | 0 .../Lib}/src/main/res/values/dimens.xml | 0 .../Lib}/src/main/res/values/strings.xml | 0 .../Lib}/src/main/res/values/styles.xml | 0 .../build.gradle | 0 .../kotlinAnnotations/android/app/annotations.xml | 0 .../local.properties | 2 +- .../testProject/AndroidProject/settings.gradle | 1 + .../{alfa => kotlinJavaProject}/build.gradle | 0 .../com/google/common/base/annotations.xml | 0 .../src/deploy/kotlin/kotlinSrc.kt | 0 .../src/main/java/demo/Greeter.java | 0 .../src/main/java/demo/HelloWorld.java | 0 .../src/main/kotlin/helloWorld.kt | 0 .../src/test/kotlin/tests.kt | 0 .../{beta => kotlinProject}/build.gradle | 0 .../com/google/common/base/annotations.xml | 0 .../src/main/kotlin/helloWorld.kt | 0 .../src/test/kotlin/tests.kt | 0 55 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/build.gradle (96%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/AndroidManifest.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/drawable-hdpi/ic_launcher.png (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/drawable-mdpi/ic_launcher.png (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/drawable-xhdpi/ic_launcher.png (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/layout/activity_main.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/layout/activity_main2.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/menu/main.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/menu/main_activity2.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/values-sw600dp/dimens.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/values-sw720dp-land/dimens.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/values-v11/styles.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/values-v14/styles.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/values/dimens.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/values/strings.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/AndroidAlfa => AndroidProject/Android}/src/main/res/values/styles.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/build.gradle (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/libs/android-support-v4.jar (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/AndroidManifest.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/ic_launcher-web.png (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/java/org/jetbrains/kotlin/gradle/test/android/libalfa/LibMainActivity.java (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/kotlin/Foo.kt (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/drawable-hdpi/ic_launcher.png (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/drawable-mdpi/ic_launcher.png (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/drawable-xhdpi/ic_launcher.png (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/drawable-xxhdpi/ic_launcher.png (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/layout/lib_activity_main.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/menu/lib_main.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/values-sw600dp/dimens.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/values-sw720dp-land/dimens.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/values-v11/styles.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/values-v14/styles.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/values/dimens.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/values/strings.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject/LibAlfa => AndroidProject/Lib}/src/main/res/values/styles.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject => AndroidProject}/build.gradle (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject => AndroidProject}/kotlinAnnotations/android/app/annotations.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{AndroidAlfaProject => AndroidProject}/local.properties (86%) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/settings.gradle rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{alfa => kotlinJavaProject}/build.gradle (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{alfa => kotlinJavaProject}/externalAnnotations/com/google/common/base/annotations.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{alfa => kotlinJavaProject}/src/deploy/kotlin/kotlinSrc.kt (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{alfa => kotlinJavaProject}/src/main/java/demo/Greeter.java (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{alfa => kotlinJavaProject}/src/main/java/demo/HelloWorld.java (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{alfa => kotlinJavaProject}/src/main/kotlin/helloWorld.kt (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{alfa => kotlinJavaProject}/src/test/kotlin/tests.kt (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{beta => kotlinProject}/build.gradle (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{beta => kotlinProject}/externalAnnotations/com/google/common/base/annotations.xml (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{beta => kotlinProject}/src/main/kotlin/helloWorld.kt (100%) rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/{beta => kotlinProject}/src/test/kotlin/tests.kt (100%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt index ac4b4db2767..303d2f6e9d6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt @@ -8,11 +8,11 @@ Ignore("Requires Android SDK") class KotlinAndroidGradleIT: BaseGradleIT() { Test fun testSimpleCompile() { - val project = Project("AndroidAlfaProject", "1.6") + val project = Project("AndroidProject", "1.6") project.build("build") { assertSuccessful() - assertContains(":LibAlfa:compileReleaseKotlin", + assertContains(":Lib:compileReleaseKotlin", ":compileFlavor1DebugKotlin", ":compileFlavor2DebugKotlin", ":compileFlavor1JnidebugKotlin", @@ -30,14 +30,14 @@ class KotlinAndroidGradleIT: BaseGradleIT() { // Run the build second time, assert everything is up-to-date project.build("build") { assertSuccessful() - assertContains(":LibAlfa:compileReleaseKotlin UP-TO-DATE", ":LibAlfa:compileRelease UP-TO-DATE") + assertContains(":Lib:compileReleaseKotlin UP-TO-DATE", ":Lib:compileRelease UP-TO-DATE") } // Run the build third time, re-run tasks project.build("build", "--rerun-tasks") { assertSuccessful() - assertContains(":LibAlfa:compileReleaseKotlin", + assertContains(":Lib:compileReleaseKotlin", ":compileFlavor1DebugKotlin", ":compileFlavor2DebugKotlin", ":compileFlavor1JnidebugKotlin", diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 72d9d3792d2..692404341e5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.BaseGradleIT.Project class BasicKotlinGradleIT: BaseGradleIT() { Test fun testCrossCompile() { - val project = Project("alfa") + val project = Project("kotlinJavaProject") project.build("compileDeployKotlin", "build") { assertSuccessful() @@ -31,7 +31,7 @@ class BasicKotlinGradleIT: BaseGradleIT() { } Test fun testKotlinOnlyCompile() { - val project = Project("beta") + val project = Project("kotlinProject") project.build("build") { assertSuccessful() diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle deleted file mode 100644 index 77659c2f96d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':AndroidAlfa', ':LibAlfa' diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle index cb69e5b7480..a7dd2eff81e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'android' apply plugin: 'kotlin-android' dependencies { - compile project(':LibAlfa') + compile project(':Lib') } android { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/AndroidManifest.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/AndroidManifest.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/layout/activity_main.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/layout/activity_main.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/layout/activity_main2.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/layout/activity_main2.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/menu/main.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/menu/main.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/menu/main_activity2.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/menu/main_activity2.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values-sw600dp/dimens.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values-sw720dp-land/dimens.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values-v11/styles.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values-v11/styles.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values-v14/styles.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values-v14/styles.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values/dimens.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values/dimens.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values/strings.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values/strings.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values/styles.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/res/values/styles.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/build.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/build.gradle rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/build.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/libs/android-support-v4.jar b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/libs/android-support-v4.jar similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/libs/android-support-v4.jar rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/libs/android-support-v4.jar diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/AndroidManifest.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/AndroidManifest.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/AndroidManifest.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/ic_launcher-web.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/ic_launcher-web.png similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/ic_launcher-web.png rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/ic_launcher-web.png diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/android/libalfa/LibMainActivity.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/java/org/jetbrains/kotlin/gradle/test/android/libalfa/LibMainActivity.java similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/android/libalfa/LibMainActivity.java rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/java/org/jetbrains/kotlin/gradle/test/android/libalfa/LibMainActivity.java diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/kotlin/Foo.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/kotlin/Foo.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/kotlin/Foo.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/kotlin/Foo.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-hdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-hdpi/ic_launcher.png rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-mdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-mdpi/ic_launcher.png rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xhdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xhdpi/ic_launcher.png rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xxhdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/drawable-xxhdpi/ic_launcher.png rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/layout/lib_activity_main.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/layout/lib_activity_main.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/layout/lib_activity_main.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/layout/lib_activity_main.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/menu/lib_main.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/menu/lib_main.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/menu/lib_main.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/menu/lib_main.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw600dp/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw600dp/dimens.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values-sw600dp/dimens.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw720dp-land/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-sw720dp-land/dimens.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values-sw720dp-land/dimens.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v11/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values-v11/styles.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v11/styles.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values-v11/styles.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v14/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values-v14/styles.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values-v14/styles.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values-v14/styles.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values/dimens.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/dimens.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values/dimens.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values/strings.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/strings.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values/strings.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values/styles.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/LibAlfa/src/main/res/values/styles.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Lib/src/main/res/values/styles.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/build.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/build.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/kotlinAnnotations/android/app/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/kotlinAnnotations/android/app/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/kotlinAnnotations/android/app/annotations.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/kotlinAnnotations/android/app/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/local.properties similarity index 86% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/local.properties index c47520a1bed..45051c5187b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/local.properties @@ -7,4 +7,4 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -sdk.dir=C:/Program Files (x86)/Android/android-studio/sdk \ No newline at end of file +sdk.dir=C:/Program Files (x86)/Android/android-studio-0.5.1/sdk \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/settings.gradle new file mode 100644 index 00000000000..d399c228f26 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/settings.gradle @@ -0,0 +1 @@ +include ':Android', ':Lib' diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/build.gradle rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/build.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/externalAnnotations/com/google/common/base/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/externalAnnotations/com/google/common/base/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/deploy/kotlin/kotlinSrc.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/deploy/kotlin/kotlinSrc.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/deploy/kotlin/kotlinSrc.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/deploy/kotlin/kotlinSrc.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/java/demo/Greeter.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java/demo/Greeter.java similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/java/demo/Greeter.java rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java/demo/Greeter.java diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/java/demo/HelloWorld.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java/demo/HelloWorld.java similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/java/demo/HelloWorld.java rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/java/demo/HelloWorld.java diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/kotlin/helloWorld.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/main/kotlin/helloWorld.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/test/kotlin/tests.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/test/kotlin/tests.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/test/kotlin/tests.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinJavaProject/src/test/kotlin/tests.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/beta/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/beta/build.gradle rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/build.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/beta/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/externalAnnotations/com/google/common/base/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/beta/externalAnnotations/com/google/common/base/annotations.xml rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/externalAnnotations/com/google/common/base/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/beta/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/src/main/kotlin/helloWorld.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/beta/src/main/kotlin/helloWorld.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/src/main/kotlin/helloWorld.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/beta/src/test/kotlin/tests.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/src/test/kotlin/tests.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/beta/src/test/kotlin/tests.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kotlinProject/src/test/kotlin/tests.kt