Fix friend paths not configured correctly with separate classes dirs
(cherry picked from commit d5ee659)
This commit is contained in:
+1
-1
@@ -12,6 +12,6 @@ abstract class BaseMultiGradleVersionIT : BaseGradleIT() {
|
|||||||
companion object {
|
companion object {
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
@Parameters(name = "Test with Gradle version {0}")
|
@Parameters(name = "Test with Gradle version {0}")
|
||||||
fun params() = listOf("2.10", "2.14.1", "3.2", "3.3", "3.4").map { arrayOf(it) }
|
fun params() = listOf("2.10", "2.14.1", "3.2", "3.3", "3.4", "4.0").map { arrayOf(it) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-9
@@ -171,15 +171,6 @@ class KotlinGradleIT: BaseGradleIT() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
fun testInternalTest() {
|
|
||||||
Project("internalTest", GRADLE_VERSION).build("build") {
|
|
||||||
assertSuccessful()
|
|
||||||
assertReportExists()
|
|
||||||
assertContains(":compileKotlin", ":compileTestKotlin")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testMultiprojectPluginClasspath() {
|
fun testMultiprojectPluginClasspath() {
|
||||||
Project("multiprojectClassPathTest", GRADLE_VERSION).build("build") {
|
Project("multiprojectClassPathTest", GRADLE_VERSION).build("build") {
|
||||||
|
|||||||
+9
@@ -68,4 +68,13 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() {
|
|||||||
assertSuccessful()
|
assertSuccessful()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testInternalTest() {
|
||||||
|
Project("internalTest", gradleVersion).build("build") {
|
||||||
|
assertSuccessful()
|
||||||
|
assertReportExists()
|
||||||
|
assertContains(":compileKotlin", ":compileTestKotlin")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+3
-1
@@ -139,7 +139,9 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
|
|||||||
protected val friendTask: AbstractKotlinCompile<T>?
|
protected val friendTask: AbstractKotlinCompile<T>?
|
||||||
get() = friendTaskName?.let { project.tasks.findByName(it) } as? AbstractKotlinCompile<T>
|
get() = friendTaskName?.let { project.tasks.findByName(it) } as? AbstractKotlinCompile<T>
|
||||||
|
|
||||||
var friendPaths: Lazy<Array<String>?> = lazy { friendTask?.javaOutputDir?.absolutePath?.let { arrayOf(it) } }
|
var friendPaths: Lazy<Array<String>?> = lazy {
|
||||||
|
friendTask?.run { arrayOf((javaOutputDir ?: destinationDir).absolutePath) }
|
||||||
|
}
|
||||||
|
|
||||||
override fun compile() {
|
override fun compile() {
|
||||||
assert(false, { "unexpected call to compile()" })
|
assert(false, { "unexpected call to compile()" })
|
||||||
|
|||||||
Reference in New Issue
Block a user