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

IDE: Add a flag to disable native libraries propagation

Browse Source
This commit is contained in:
Ilya Matveev
2019-09-27 12:29:18 +07:00
parent becdd7a5e6
commit 95cbb4e8b4
10 changed files with 112 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
+9 -8
View File
@@ -577,12 +577,13 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
val mergedDependencies = LinkedHashSet<KotlinDependency>().apply {
addAll(sourceSet.dependencies.mapNotNull { mppModel.dependencyMap[it] })
dependeeSourceSets.flatMapTo(this) { it.dependencies.mapNotNull { mppModel.dependencyMap[it] } }
if (sourceSet.actualPlatforms.getSinglePlatform() == KotlinPlatform.NATIVE) {
sourceSetToCompilations[sourceSet.name]
?.takeIf { it.size > 1 }
?.let { compilations ->
addAll(propagatedDependencies(compilations))
}
if (mppModel.extraFeatures.isNativeDependencyPropagationEnabled
&& mppModel.extraFeatures.isHMPPEnabled
&& sourceSet.actualPlatforms.getSinglePlatform() == KotlinPlatform.NATIVE
) {
sourceSetToCompilations[sourceSet.name]?.let { compilations ->
addAll(propagatedNativeDependencies(compilations))
}
}
}
buildDependencies(
@@ -609,8 +610,8 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
// Currently such special casing is available for Apple platforms
// (iOS, watchOS and tvOS) and native Android (ARM, X86).
// TODO: Do we need to support user's interop libraries too?
private fun propagatedDependencies(compilations: List<CompilationWithDependencies>): List<ExternalDependency> {
if (compilations.isEmpty()) {
private fun propagatedNativeDependencies(compilations: List<CompilationWithDependencies>): List<ExternalDependency> {
if (compilations.size <= 1) {
return emptyList()
}
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
+3 -3
View File
@@ -86,8 +86,8 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
assertModuleModuleDepScope("jvm_test", "common2_test", DependencyScope.COMPILE)
assertModuleModuleDepScope("js_main", "common1_main", DependencyScope.COMPILE)
assertModuleModuleDepScope("js_test", "common1_test", DependencyScope.COMPILE)
assertNoDepForModule("js_main", "common2_main")
assertNoDepForModule("js_test", "common2_test")
assertNoModuleDepForModule("js_main", "common2_main")
assertNoModuleDepForModule("js_test", "common2_test")
}
@Test
@@ -190,7 +190,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
assertModuleModuleDepScope("project2_main", "project1_main", DependencyScope.COMPILE)
assertModuleModuleDepScope("project3_main", "project2_main", DependencyScope.COMPILE)
assertNoDepForModule("project3_main", "project1_main")
assertNoModuleDepForModule("project3_main", "project1_main")
TestCase.assertEquals(
listOf("jar:///project2/build/libs/project2-jar.jar!/"),
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java
+6 -5
View File
@@ -32,10 +32,7 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
import com.intellij.openapi.externalSystem.util.ExternalSystemUtil;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.roots.DependencyScope;
import com.intellij.openapi.roots.ModuleOrderEntry;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.OrderEntry;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
@@ -247,10 +244,14 @@ public abstract class ExternalSystemImportingTestCase extends ExternalSystemTest
expectedScopes, actualScopes);
}
protected void assertNoDepForModule(String moduleName, String depName) {
protected void assertNoModuleDepForModule(String moduleName, String depName) {
assertEmpty("No dependency '" + depName + "' was expected", collectModuleDeps(moduleName, depName, ModuleOrderEntry.class));
}
protected void assertNoLibraryDepForModule(String moduleName, String depName) {
assertEmpty("No dependency '" + depName + "' was expected", collectModuleDeps(moduleName, depName, LibraryOrderEntry.class));
}
@NotNull
private List<ModuleOrderEntry> getModuleModuleDeps(@NotNull String moduleName, @NotNull String depName) {
return getModuleDep(moduleName, depName, ModuleOrderEntry.class);