Support Java package prefix in Gradle plugin

Issue #KT-17150 Fixed
2017-08-09 19:42:31 +03:00
parent 4cf2bf6ca5
commit 192d569e54
6 changed files with 47 additions and 12 deletions
@@ -43,13 +43,21 @@ import java.util.*
 fun Iterable<File>.javaSourceRoots(roots: Iterable<File>): Iterable<File> =
        filter(File::isJavaFile).mapNotNull { findSrcDirRoot(it, roots) }

-fun makeModuleFile(name: String, isTest: Boolean, outputDir: File, sourcesToCompile: Iterable<File>, javaSourceRoots: Iterable<File>, classpath: Iterable<File>, friendDirs: Iterable<File>): File {
+fun makeModuleFile(
+        name: String,
+        isTest: Boolean,
+        outputDir: File,
+        sourcesToCompile: Iterable<File>,
+        javaSourceRoots: Iterable<JvmSourceRoot>,
+        classpath: Iterable<File>,
+        friendDirs: Iterable<File>
+): File {
    val builder = KotlinModuleXmlBuilder()
    builder.addModule(
            name,
            outputDir.absolutePath,
            sourcesToCompile,
-            javaSourceRoots.map { JvmSourceRoot(it) },
+            javaSourceRoots,
            classpath,
            null,
            "java-production",