Insert all module transitive module dependencies #SCL-21158 #59
Conversation
azdrojowa123
changed the title
azdrojowa123
force-pushed
the
insert_all_module_transitive_dependencies
branch
from
2500b00
to
32257dd
Compare
azdrojowa123
force-pushed
the
insert_all_module_transitive_dependencies
branch
8 times, most recently
from
d3849bf
to
dffb000
Compare
extractor/src/main/scala/org/jetbrains/sbt/extractors/AndroidSdkPluginExtractor.scala
Outdated
Show resolved
Hide resolved
shared/src/main/scala/org/jetbrains/sbt/structure/dataSerializers.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
extractor/src/main/scala/org/jetbrains/sbt/extractors/DependenciesExtractor.scala
Outdated
Show resolved
Hide resolved
| val sourceConfigurationsNames = sourceConfigurations.map(_.name) | ||
| val transformedConfigurations = mapConfigurations(configurations).map { configuration => | ||
| // additional mapping is required in case of situation where project1 dependsOn project2 in two custom configurations -> the test one | ||
| // and the one containing sources. Without this mapping custom test configuration will be transformed to TEST in #mapConfigurations and in the scala plugin, scope |
There was a problem hiding this comment.
Please ensure that this special case mentioned in the comment is covered with tests.
ATM it might be easier to use sbt import integration tests in Scala Plugin
| * It needs to be done because `Classpaths#interSort` generate transitive dependencies by analyzing configurations strings (e.g. "compile->provided") | ||
| * So for such project: <br> | ||
| * {{{ val root = (project in file(".")).dependsOn(proj1 % "compile->provided") }}} | ||
| * `Classpaths#interSort` will return: |
There was a problem hiding this comment.
Please ensure that this special case mentioned in the comment is covered with tests.
ATM it might be easier to use sbt import integration tests in Scala Plugin
azdrojowa123
force-pushed
the
insert_all_module_transitive_dependencies
branch
2 times, most recently
from
55aad34
to
b4286e1
Compare
|
I didn't resolve conversations that relate to the changes that I made in CR commits and may be discussable, or I am not sure that this is what was meant. |
| val allSourceConfigurationsTask = StructureKeys.allSourceConfigurations.in(projectRef).get(state) | ||
| val allTestConfigurationsTask = StructureKeys.allTestConfigurations.in(projectRef).get(state) | ||
|
|
||
| val classpathConfigurationTask = sbt.Keys.classpathConfiguration.in(projectRef) |
There was a problem hiding this comment.
I changed it to use only allConfigurationsWithSource setting key for all projects, it is more cleaner
| } yield { | ||
|
|
||
| val projectToTransitiveDependencies = getTransitiveDependenciesForProject( |
There was a problem hiding this comment.
Instead of allSourceConfigurationsTask and allTestConfigurationsTask now I only use one setting key.
For now I left that sourceConfigurations and classpathConfigurationTask are always executed, not only when options.insertProjectTransitiveDependencies is true for simplicity. It shouldn't waste a lot of resources.
If I notice an increase in import time during tests on my branch in comparison to idea233.x, I will come back here.
| * would be calculated to `TEST` (in [[org.jetbrains.sbt.project.SbtProjectResolver.scopeFor]]) which would not be truth, | ||
| * because now the scope for `dummy` dependency should be `COMPILE`. | ||
| * | ||
| * Check behaviour of this logic when SCL-18284 will be fixed |
There was a problem hiding this comment.
tested in testCustomConfigurationsWithNestedProjectDependencies in the scala plugin
| * [[sbt.Classpaths.interSort]] for `compile` scope in project `root` will return: {{{ | ||
| * compile -> (proj1, "provided"), (proj2, "compile") | ||
| * }}} | ||
| * which in practice means that we only have to add `proj2` as a dependency to `root` and `proj1` dependency shouldn't be taken into account. |
There was a problem hiding this comment.
tested in testNonSourceConfigurationsWithNestedProjectDependencies in scala plugin
azdrojowa123
force-pushed
the
insert_all_module_transitive_dependencies
branch
from
ce411a3
to
7d0c3fe
Compare
[project transitive dependencies] fix deserializers
azdrojowa123
force-pushed
the
insert_all_module_transitive_dependencies
branch
from
7d0c3fe
to
feaf978
Compare
azdrojowa123
force-pushed
the
insert_all_module_transitive_dependencies
branch
from
feaf978
to
258c788
Compare
No description provided.