[Platform API] Clean-up some usages of Platform
Mostly unused imports. Also, in some places, TargetPlatform/MultiTargetPlatform were just passed around without actually using (e.g. in deserialization)
This commit is contained in:
-3
@@ -120,7 +120,4 @@ object JvmResolverForModuleFactory : ResolverForModuleFactory() {
|
||||
|
||||
return ResolverForModule(CompositePackageFragmentProvider(providersForModule), container)
|
||||
}
|
||||
|
||||
override val targetPlatform: TargetPlatform
|
||||
get() = JvmPlatform
|
||||
}
|
||||
|
||||
@@ -192,7 +192,7 @@ class ResolverForProjectImpl<M : ModuleInfo>(
|
||||
descriptor as ModuleDescriptorImpl,
|
||||
projectContext.withModule(descriptor),
|
||||
moduleContent,
|
||||
platformParameters(resolverForModuleFactory.targetPlatform),
|
||||
platformParameters(module.platform ?: TODO("Missing platform!")),
|
||||
targetEnvironment,
|
||||
this@ResolverForProjectImpl,
|
||||
languageVersionSettings,
|
||||
@@ -307,8 +307,6 @@ abstract class ResolverForModuleFactory {
|
||||
languageVersionSettings: LanguageVersionSettings,
|
||||
targetPlatformVersion: TargetPlatformVersion
|
||||
): ResolverForModule
|
||||
|
||||
abstract val targetPlatform: TargetPlatform
|
||||
}
|
||||
|
||||
class LazyModuleDependencies<M : ModuleInfo>(
|
||||
|
||||
+5
-6
@@ -152,8 +152,8 @@ object CommonResolverForModuleFactory : ResolverForModuleFactory() {
|
||||
targetEnvironment: TargetEnvironment,
|
||||
metadataPartProvider: MetadataPartProvider,
|
||||
languageVersionSettings: LanguageVersionSettings
|
||||
): StorageComponentContainer = createContainer("ResolveCommonCode", targetPlatform) {
|
||||
configureModule(moduleContext, targetPlatform, TargetPlatformVersion.NoVersion, bindingTrace)
|
||||
): StorageComponentContainer = createContainer("ResolveCommonCode", CommonPlatform) {
|
||||
configureModule(moduleContext, CommonPlatform, TargetPlatformVersion.NoVersion, bindingTrace)
|
||||
|
||||
useInstance(moduleContentScope)
|
||||
useInstance(LookupTracker.DO_NOTHING)
|
||||
@@ -173,9 +173,8 @@ object CommonResolverForModuleFactory : ResolverForModuleFactory() {
|
||||
?: error("No MetadataFinderFactory in project")
|
||||
useInstance(metadataFinderFactory.create(moduleContentScope))
|
||||
|
||||
|
||||
|
||||
targetEnvironment.configure(this)
|
||||
}
|
||||
|
||||
override val targetPlatform: TargetPlatform
|
||||
get() = CommonPlatform
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user