azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unresolved library with 'java-api' and 'java-runtime' usages

Browse Source
This commit is contained in:
Sergey Igushkin
2018-09-29 13:32:02 +03:00
parent d77a0f109b
commit 748dc203e5
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinUsages.kt
+5 -1
View File
@@ -55,7 +55,8 @@ object KotlinUsages {
override fun execute(details: CompatibilityCheckDetails<Usage>) = with(details) {
when {
consumerValue?.name == KOTLIN_API && producerValue?.name == JAVA_API -> compatible()
consumerValue?.name in values && producerValue?.name == JAVA_RUNTIME_JARS -> compatible()
consumerValue?.name in values &&
producerValue?.name.let { it == JAVA_RUNTIME || it == JAVA_RUNTIME_JARS } -> compatible()
}
}
}
@@ -72,6 +73,9 @@ object KotlinUsages {
if (JAVA_API in candidateNames && JAVA_RUNTIME_JARS in candidateNames && values.none { it in candidateNames }) {
details.closestMatch(candidateValues.single { it?.name == JAVA_API }!!)
}
if (JAVA_API in candidateNames && JAVA_RUNTIME in candidateNames && values.none { it in candidateNames }) {
details.closestMatch(candidateValues.single { it?.name == JAVA_API }!!)
}
if (JAVA_RUNTIME_CLASSES in candidateNames && JAVA_RUNTIME_RESOURCES in candidateNames && KOTLIN_RUNTIME in candidateNames) {
closestMatch(candidateValues.single { it?.name == KOTLIN_RUNTIME }!!)
}