KLIB: Fix compilation

idea/idea-analysis/src/org/jetbrains/kotlin/caches/resolve/CompositeResolverForModuleFactory.kt

@@ -131,7 +131,7 @@ class CompositeResolverForModuleFactory(
         var klibMetadataProvider: PackageFragmentProvider? = null
 
         if (moduleInfo is CommonKlibLibraryInfo && moduleInfo.compatibilityInfo.isCompatible) {
-            val library = moduleInfo.commonLibrary
+            val library = moduleInfo.resolvedKotlinLibrary
             val languageVersionSettings = container.get<LanguageVersionSettings>()
 
             val packageFragmentNames = parseModuleHeader(library.moduleHeaderData).packageFragmentNameList

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/klib/KlibMetaBinary.kt

@@ -1,10 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-package org.jetbrains.kotlin.ide.konan.decompiler
-
-import org.jetbrains.kotlin.idea.klib.KlibMetaFileType
-import org.jetbrains.kotlin.idea.util.KotlinBinaryExtension
-
-class KlibMetaBinary : KotlinBinaryExtension(KlibMetaFileType)

idea/idea-analysis/src/org/jetbrains/kotlin/idea/klib/AbstractKlibLibraryInfo.kt

@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.konan.file.File
 import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy
 import org.jetbrains.kotlin.library.resolveSingleFileKlib
 
-abstract class AbstractKlibLibraryInfo(project: Project, library: Library, protected val libraryRoot: String) : LibraryInfo(project, library) {
+abstract class AbstractKlibLibraryInfo(project: Project, library: Library, val libraryRoot: String) : LibraryInfo(project, library) {
 
     val resolvedKotlinLibrary = resolveSingleFileKlib(
         libraryFile = File(libraryRoot),

idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt

@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.KotlinModuleFileType
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
 import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
 import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType
+import org.jetbrains.kotlin.idea.klib.KlibMetaFileType
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
 import kotlin.script.experimental.api.ScriptAcceptedLocation
@@ -50,6 +51,7 @@ class JavaClassBinary : KotlinBinaryExtension(JavaClassFileType.INSTANCE)
 class KotlinBuiltInBinary : KotlinBinaryExtension(KotlinBuiltInFileType)
 class KotlinModuleBinary : KotlinBinaryExtension(KotlinModuleFileType.INSTANCE)
 class KotlinJsMetaBinary : KotlinBinaryExtension(KotlinJavaScriptMetaFileType)
+class KlibMetaBinary : KotlinBinaryExtension(KlibMetaFileType)
 
 fun FileType.isKotlinBinary(): Boolean = this in KotlinBinaryExtension.kotlinBinaries