mirror of
https://github.com/jlengrand/kotlin.git
synced 2026-03-10 08:31:29 +00:00
JPS: exclude source roots from other targets
Previously `findJavaRootDescriptor` was return source root for random module. This cause build errors for mpp (same file may appear in multiple source roots of common and platform modules) #KT-28988 Fixed
This commit is contained in:
@@ -0,0 +1,4 @@
|
||||
c [sourceSetHolder]
|
||||
|
||||
pJvm [compilationAndSourceSetHolder, jvm]
|
||||
pJvm -> c [include]
|
||||
14
jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log
vendored
Normal file
14
jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log
vendored
Normal file
@@ -0,0 +1,14 @@
|
||||
================ Step #1 =================
|
||||
|
||||
Building c
|
||||
Building pJvm
|
||||
Cleaning output files:
|
||||
out/production/pJvm/FJvmKt.class
|
||||
out/production/pJvm/META-INF/pJvm.kotlin_module
|
||||
End of files
|
||||
Compiling files:
|
||||
c/src/f.kt
|
||||
pJvm/src/fJvm.kt
|
||||
End of files
|
||||
Exit code: OK
|
||||
------------------------------------------
|
||||
9
jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt
vendored
Normal file
9
jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt
vendored
Normal file
@@ -0,0 +1,9 @@
|
||||
expect fun f()
|
||||
|
||||
@ExperimentalMultiplatform
|
||||
@OptionalExpectation
|
||||
internal expect annotation class SharedImmutable()
|
||||
|
||||
@ExperimentalMultiplatform
|
||||
@SharedImmutable
|
||||
val UNDEFINED = 1
|
||||
@@ -0,0 +1,3 @@
|
||||
actual fun f() = Unit
|
||||
|
||||
fun x() = 1
|
||||
@@ -0,0 +1,3 @@
|
||||
actual fun f() = Unit
|
||||
|
||||
fun x() = 2
|
||||
Reference in New Issue
Block a user