Revert "Probably fix issue with creating module descriptor for SDK twice"
This reverts commit 92adccde
Actually this commit didn't fix anything so it can be reverted
This commit is contained in:
@@ -52,7 +52,7 @@ abstract class AbstractResolverForProject<M : ModuleInfo>(
|
||||
assert(moduleInfoToResolvableInfo.values.toSet() == modules.toSet())
|
||||
}
|
||||
|
||||
abstract fun sdkDependency(module: M, ownerModuleDescriptor: ModuleDescriptorImpl?): M?
|
||||
abstract fun sdkDependency(module: M): M?
|
||||
abstract fun modulesContent(module: M): ModuleContent<M>
|
||||
abstract fun builtInsForModule(module: M): KotlinBuiltIns
|
||||
abstract fun createResolverForModule(descriptor: ModuleDescriptor, moduleInfo: M): ResolverForModule
|
||||
@@ -68,7 +68,7 @@ abstract class AbstractResolverForProject<M : ModuleInfo>(
|
||||
LazyModuleDependencies(
|
||||
projectContext.storageManager,
|
||||
module,
|
||||
sdkDependency(module, moduleDescriptor),
|
||||
sdkDependency(module),
|
||||
this
|
||||
)
|
||||
)
|
||||
|
||||
+2
-2
@@ -35,7 +35,7 @@ class ResolverForSingleModuleProject<M : ModuleInfo>(
|
||||
EmptyResolverForProject(),
|
||||
PackageOracleFactory.OptimisticFactory
|
||||
) {
|
||||
override fun sdkDependency(module: M, ownerModuleDescriptor: ModuleDescriptorImpl?): M? = sdkDependency
|
||||
override fun sdkDependency(module: M): M? = sdkDependency
|
||||
|
||||
init {
|
||||
knownDependencyModuleDescriptors.forEach { (module, descriptor) ->
|
||||
@@ -61,4 +61,4 @@ class ResolverForSingleModuleProject<M : ModuleInfo>(
|
||||
this,
|
||||
languageVersionSettings
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user