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

User friendly presentation of KLIBs in IDEA

Browse Source 
Missed fixes in 181 bunch
This commit is contained in:
Dmitriy Dolovov
2019-02-15 15:32:14 +07:00
parent 05323f8a30
commit 375697c413
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181
+3 -2
View File
@@ -16,6 +16,7 @@ import org.gradle.api.file.FileCollection
import org.gradle.api.file.SourceDirectorySet import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.logging.Logging import org.gradle.api.logging.Logging
import org.gradle.api.provider.Property import org.gradle.api.provider.Property
import org.jetbrains.kotlin.gradle.KotlinMPPGradleModel.Companion.NO_KOTLIN_NATIVE_HOME
import org.jetbrains.plugins.gradle.model.* import org.jetbrains.plugins.gradle.model.*
import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
import org.jetbrains.plugins.gradle.tooling.ModelBuilderService import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
@@ -24,7 +25,6 @@ import org.jetbrains.plugins.gradle.tooling.util.DependencyResolverImpl
import org.jetbrains.plugins.gradle.tooling.util.SourceSetCachedFinder import org.jetbrains.plugins.gradle.tooling.util.SourceSetCachedFinder
import java.io.File import java.io.File
import java.lang.reflect.Method import java.lang.reflect.Method
import org.jetbrains.kotlin.gradle.KotlinMPPGradleModel.Companion.NO_KOTLIN_NATIVE_HOME
class KotlinMPPGradleModelBuilder : ModelBuilderService { class KotlinMPPGradleModelBuilder : ModelBuilderService {
override fun getErrorMessageBuilder(project: Project, e: Exception): ErrorMessageBuilder { override fun getErrorMessageBuilder(project: Project, e: Exception): ErrorMessageBuilder {
@@ -51,7 +51,8 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
computeSourceSetsDeferredInfo(sourceSets, targets) computeSourceSetsDeferredInfo(sourceSets, targets)
val coroutinesState = getCoroutinesState(project) val coroutinesState = getCoroutinesState(project)
reportUnresolvedDependencies(targets) reportUnresolvedDependencies(targets)
return KotlinMPPGradleModelImpl(sourceSetMap, targets, ExtraFeaturesImpl(coroutinesState), NO_KOTLIN_NATIVE_HOME) val kotlinNativeHome = KotlinNativeHomeEvaluator.getKotlinNativeHome(project) ?: NO_KOTLIN_NATIVE_HOME
return KotlinMPPGradleModelImpl(sourceSetMap, targets, ExtraFeaturesImpl(coroutinesState), kotlinNativeHome)
} }
private fun reportUnresolvedDependencies(targets: Collection<KotlinTarget>) { private fun reportUnresolvedDependencies(targets: Collection<KotlinTarget>) {