Introduce DeserializationConfiguration

Will be used soon to deliver the language/API-version-related behavior to the
deserialization

compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt

@@ -74,6 +74,7 @@ fun StorageComponentContainer.configureJavaTopDownAnalysis(
     useInstance(InternalFlexibleTypeTransformer)
 
     useInstance(languageVersionSettings)
+    useImpl<CompilerDeserializationConfiguration>()
 }
 
 fun createContainerForLazyResolveWithJava(

compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt

@@ -142,6 +142,7 @@ fun createContainerForLazyResolve(
     useInstance(languageVersionSettings)
 
     useImpl<FileScopeProviderImpl>()
+    useImpl<CompilerDeserializationConfiguration>()
     targetEnvironment.configure(this)
 
     useImpl<LazyResolveToken>()

compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerDeserializationConfiguration.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.resolve
+
+import org.jetbrains.kotlin.config.LanguageVersionSettings
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
+
+class CompilerDeserializationConfiguration(private val languageVersionSettings: LanguageVersionSettings) : DeserializationConfiguration

compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt

@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.js.config.JSConfigurationKeys
 import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
 import org.jetbrains.kotlin.js.resolve.JsPlatform
 import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.TestCaseWithTmpdir
@@ -88,8 +89,9 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
         val metadata = KotlinJavascriptMetadataUtils.loadMetadata(metaFile)
         assert(metadata.size == 1)
 
-        val provider = KotlinJavascriptSerializationUtil.readModule(metadata[0].body, LockBasedStorageManager(), module).data
-                .sure { "No package fragment provider was created" }
+        val provider = KotlinJavascriptSerializationUtil.readModule(
+                metadata.single().body, LockBasedStorageManager(), module, DeserializationConfiguration.Default
+        ).data.sure { "No package fragment provider was created" }
 
         module.initialize(provider)
         module.setDependencies(module, module.builtIns.builtInsModule)