Add src/{main,test}/java as conventional resource prefix (bazelbuil…

…d#927)

The native `java_*` rules recognize these prefixes and emit resources
relative to it. Depending on the same resource from `java_*` or `kt_*`
should ideally behave in the same way.

kotlin/internal/jvm/compile.bzl

@@ -138,7 +138,9 @@ def _collect_plugins_for_export(local, exports):
     )
 
 _CONVENTIONAL_RESOURCE_PATHS = [
+    "src/main/java",
     "src/main/resources",
+    "src/test/java",
     "src/test/resources",
     "kotlin",
 ]

src/test/data/jvm/basic/BUILD

@@ -65,6 +65,8 @@ kt_jvm_library(
     name = "conventional_strip_resources",
     srcs = glob(["testresources/src/*.kt"]),
     resources = glob([
+        "conventional_strip_resources/src/main/java/**/*",
+        "conventional_strip_resources/src/test/java/**/*",
         "conventional_strip_resources/src/main/resources/**/*",
         "conventional_strip_resources/src/test/resources/**/*",
     ]),

src/test/kotlin/io/bazel/kotlin/KotlinJvmBasicAssertionTest.kt

@@ -59,7 +59,7 @@ class KotlinJvmBasicAssertionTest : KotlinAssertionTestCase("src/test/data/jvm/b
       "conventional_strip_resources.jar",
       description = "the rules should support conventional prefix stripping"
     ) {
-      assertContainsEntries("main.txt", "test.txt")
+      assertContainsEntries("java_main.txt", "java_test.txt", "main.txt", "test.txt")
     }
   }