[Resolve] Compute dependency on SDK properly

Under COMPOSITE resolution mode (see ResolutionModeComponent) we have
no fixed and globally known SDK, instead, for each module we have to
find SDK it it's transitive dependencies.

Currently, this is necessary in order to create proper JvmBuiltIns,
which need dependency on SDK to be present in immediate dependencies.
This commit is contained in:
Dmitry Savvinov
2019-06-05 12:36:12 +03:00
parent 02c07a4a6c
commit 9f2a03947c
4 changed files with 25 additions and 5 deletions
@@ -96,7 +96,7 @@ class ResolverForProjectImpl<M : ModuleInfo>(
private val invalidateOnOOCB: Boolean,
override val builtIns: KotlinBuiltIns = DefaultBuiltIns.Instance,
private val delegateResolver: ResolverForProject<M> = EmptyResolverForProject(),
private val firstDependency: M? = null,
private val sdkDependency: (M) -> M?,
private val packageOracleFactory: PackageOracleFactory = PackageOracleFactory.OptimisticFactory,
private val isReleaseCoroutines: Boolean? = null
) : ResolverForProject<M>() {
@@ -139,7 +139,7 @@ class ResolverForProjectImpl<M : ModuleInfo>(
LazyModuleDependencies(
projectContext.storageManager,
module,
firstDependency,
sdkDependency(module),
this
)
)