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

Fixed building MPP model if project root directory does not exist

Browse Source
This commit is contained in:
Andrey Uskov
2020-05-24 22:49:17 +03:00
parent c7a53e4435
commit 8eca3c8aa8
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt
+9 -3
View File
@@ -148,9 +148,11 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
val androidDeps = buildAndroidDeps(kotlinExt.javaClass.classLoader, project) val androidDeps = buildAndroidDeps(kotlinExt.javaClass.classLoader, project)
// Some performance optimisation: do not build metadata dependencies if source set is not common // Some performance optimisation: do not build metadata dependencies if source set is not common
val doBuildMetadataDependencies = val doBuildMetadataDependencies = try {
project.properties["build_metadata_dependencies_for_actualised_source_sets"]?.toString()?.toBoolean() project.properties["build_metadata_dependencies_for_actualised_source_sets"]?.toString()?.toBoolean()
?: DEFAULT_BUILD_METADATA_DEPENDENCIES_FOR_ACTUALISED_SOURCE_SETS } catch (_: Exception) {
null
} ?: DEFAULT_BUILD_METADATA_DEPENDENCIES_FOR_ACTUALISED_SOURCE_SETS
val allSourceSetsProtos = sourceSets.mapNotNull { buildSourceSet(it, dependencyResolver, project, dependencyMapper, androidDeps) } val allSourceSetsProtos = sourceSets.mapNotNull { buildSourceSet(it, dependencyResolver, project, dependencyMapper, androidDeps) }
val allSourceSets = if (doBuildMetadataDependencies) { val allSourceSets = if (doBuildMetadataDependencies) {
allSourceSetsProtos.map { proto -> proto.buildKotlinSourceSetImpl(true) } allSourceSetsProtos.map { proto -> proto.buildKotlinSourceSetImpl(true) }
@@ -176,7 +178,11 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
} }
private fun buildAndroidDeps(classLoader: ClassLoader, project: Project): Map<String, List<Any>>? { private fun buildAndroidDeps(classLoader: ClassLoader, project: Project): Map<String, List<Any>>? {
val includeAndroidDeps = project.properties["kotlin.include.android.dependencies"]?.toString()?.toBoolean() == true val includeAndroidDeps = try {
project.properties["kotlin.include.android.dependencies"]?.toString()?.toBoolean() == true
} catch (_: Exception) {
false
}
if (includeAndroidDeps) { if (includeAndroidDeps) {
try { try {
val resolverClass = classLoader.loadClass("org.jetbrains.kotlin.gradle.targets.android.internal.AndroidDependencyResolver") val resolverClass = classLoader.loadClass("org.jetbrains.kotlin.gradle.targets.android.internal.AndroidDependencyResolver")