From e51f2457bfe1604948981ce5f1ece3f6128d23d9 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Thu, 28 Jul 2016 18:53:44 +0300
Subject: [PATCH] Add additional java source dir to source set in android test

---
 .../testProject/AndroidProject/Android/build.gradle   |  1 +
 .../Android/src/main/java/foo/FooJavaClass.java       | 11 +++++++++++
 .../Android/src/main/java/foo/FooKotlinClass.kt       | 11 +++++++++++
 .../Android/src/main/java2/bar/BarJavaClass.java      | 11 +++++++++++
 .../Android/src/main/java2/bar/BarKotlinClass.kt      | 11 +++++++++++
 5 files changed, 45 insertions(+)
 create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/foo/FooJavaClass.java
 create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/foo/FooKotlinClass.kt
 create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java2/bar/BarJavaClass.java
 create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java2/bar/BarKotlinClass.kt

diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle
index 174e86dd3e0..94d0ac78f4d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/build.gradle
@@ -13,6 +13,7 @@ android {
     buildToolsVersion "21.1.2"
 
     sourceSets {
+        main.java.srcDirs += 'src/main/java2'
         main.kotlin.srcDirs += 'root/kotlin'
         test.kotlin.srcDirs += 'src/test/kotlin'
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/foo/FooJavaClass.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/foo/FooJavaClass.java
new file mode 100644
index 00000000000..68a8344d5de
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/foo/FooJavaClass.java
@@ -0,0 +1,11 @@
+package foo;
+
+import bar.*;
+
+public class FooJavaClass {
+    void f() {
+        new FooKotlinClass();
+        new BarJavaClass();
+        new BarKotlinClass();
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/foo/FooKotlinClass.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/foo/FooKotlinClass.kt
new file mode 100644
index 00000000000..d6b8608e855
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java/foo/FooKotlinClass.kt
@@ -0,0 +1,11 @@
+package foo
+
+import bar.*
+
+class FooKotlinClass {
+    fun f() {
+        FooJavaClass()
+        BarJavaClass()
+        BarKotlinClass()
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java2/bar/BarJavaClass.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java2/bar/BarJavaClass.java
new file mode 100644
index 00000000000..5cf104aaa4d
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java2/bar/BarJavaClass.java
@@ -0,0 +1,11 @@
+package bar;
+
+import foo.*;
+
+public class BarJavaClass {
+    void f() {
+        new BarKotlinClass();
+        new FooJavaClass();
+        new FooKotlinClass();
+    }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java2/bar/BarKotlinClass.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java2/bar/BarKotlinClass.kt
new file mode 100644
index 00000000000..db59b2e63b1
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidProject/Android/src/main/java2/bar/BarKotlinClass.kt
@@ -0,0 +1,11 @@
+package bar
+
+import foo.*
+
+class BarKotlinClass {
+    fun f() {
+        BarJavaClass()
+        FooJavaClass()
+        FooKotlinClass()
+    }
+}
\ No newline at end of file