Bump artefacts to 1.4.30 (#1726)

* 1.4.30-RC

* Bump artefacts to 1.4.30

6 files changed, 37 insertions, 25 deletions

diff --git a/gradle.properties b/gradle.properties
index 28a34b9e..102cce5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,13 +1,13 @@
 # Project Settings
-dokka_version_base=1.4.20.2
+dokka_version_base=1.4.30
 dokka_publication_channels=bintray-kotlin-dev&space-dokka-dev
 dokka_integration_test_parallelism=2
 # Versions
-kotlin_version=1.4.20
+kotlin_version=1.4.30
 coroutines_version=1.4.1
 kotlinx_html_version=0.7.2
-kotlin_plugin_version=1.4.20-release-327
-idea_version=201.7223.91
+kotlin_plugin_version=202-1.4.30-release-IJ8194.7
+idea_version=202.7660.26
 language_version=1.4
 # Code style
 kotlin.code.style=official
diff --git a/kotlin-analysis/intellij-dependency/build.gradle.kts b/kotlin-analysis/intellij-dependency/build.gradle.kts
index c82248ec..8282264c 100644
--- a/kotlin-analysis/intellij-dependency/build.gradle.kts
+++ b/kotlin-analysis/intellij-dependency/build.gradle.kts
@@ -8,9 +8,12 @@ plugins {
 }
 
 repositories {
+    mavenCentral()
     maven(url = "https://www.jetbrains.com/intellij-repository/snapshots")
     maven(url = "https://www.jetbrains.com/intellij-repository/releases")
-    maven(url = "https://kotlin.bintray.com/kotlin-plugin")
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide")
+    maven("https://kotlin.bintray.com/kotlin-ide-plugin-dependencies")
+    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
 }
 
 val intellijCore: Configuration by configurations.creating
@@ -21,11 +24,12 @@ fun intellijCoreAnalysis() = zipTree(intellijCore.singleFile).matching {
 
 dependencies {
     val kotlin_plugin_version: String by project
-    api("org.jetbrains.kotlin:ide-common-ij201:$kotlin_plugin_version")
-    api("org.jetbrains.kotlin:kotlin-plugin-ij201:$kotlin_plugin_version") {
-        //TODO: parametrize ij version after 1.3.70
+    api("org.jetbrains.kotlin:common:$kotlin_plugin_version")
+    api("org.jetbrains.kotlin:idea:$kotlin_plugin_version") {
         isTransitive = false
     }
+    api("org.jetbrains.kotlin:core:$kotlin_plugin_version")
+    api("org.jetbrains.kotlin:native:$kotlin_plugin_version")
 
     val idea_version: String by project
     intellijCore("com.jetbrains.intellij.idea:intellij-core:$idea_version")
diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt
index d516d57d..ef850279 100644
--- a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt
+++ b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt
@@ -13,6 +13,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.OrderEnumerationHandler
 import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.roots.ProjectRootManager
+import com.intellij.openapi.roots.impl.ProjectRootManagerImpl
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.psi.impl.source.javadoc.JavadocManagerImpl
@@ -342,8 +343,6 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
             projectContext,
             modules = module.dependencies()
         ) {
-            override fun sdkDependency(module: ModuleInfo): ModuleInfo? = null
-
             override fun modulesContent(module: ModuleInfo): ModuleContent<ModuleInfo> = modulesContent(module)
 
             override fun builtInsForModule(module: ModuleInfo): KotlinBuiltIns = DefaultBuiltIns.Instance
@@ -366,6 +365,9 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
                     this,
                     LanguageVersionSettingsImpl.DEFAULT
                 )
+
+            override fun sdkDependency(module: ModuleInfo, ownerModuleDescriptor: ModuleDescriptorImpl?): ModuleInfo? =
+                null
         }
     }
 
@@ -395,7 +397,8 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
 
             override fun builtInsForModule(module: ModuleInfo): KotlinBuiltIns = DefaultBuiltIns.Instance
 
-            override fun sdkDependency(module: ModuleInfo): ModuleInfo? = null
+            override fun sdkDependency(module: ModuleInfo, ownerModuleDescriptor: ModuleDescriptorImpl?): ModuleInfo? =
+                null
         }
     }
 
@@ -426,7 +429,8 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
 
             override fun builtInsForModule(module: ModuleInfo): KotlinBuiltIns = DefaultBuiltIns.Instance
 
-            override fun sdkDependency(module: ModuleInfo): ModuleInfo? = null
+            override fun sdkDependency(module: ModuleInfo, ownerModuleDescriptor: ModuleDescriptorImpl?): ModuleInfo? =
+                null
         }
     }
 
@@ -491,7 +495,8 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
                 LanguageVersionSettingsImpl.DEFAULT
             )
 
-            override fun sdkDependency(module: ModuleInfo): ModuleInfo? = null
+            override fun sdkDependency(module: ModuleInfo, ownerModuleDescriptor: ModuleDescriptorImpl?): ModuleInfo? =
+                null
         }
     }
 
diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/CoreProjectFileIndex.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/CoreProjectFileIndex.kt
index 77be818c..179f5e52 100644
--- a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/CoreProjectFileIndex.kt
+++ b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/CoreProjectFileIndex.kt
@@ -9,7 +9,7 @@ import com.intellij.openapi.projectRoots.SdkAdditionalData
 import com.intellij.openapi.projectRoots.SdkModificator
 import com.intellij.openapi.projectRoots.SdkTypeId
 import com.intellij.openapi.roots.*
-import com.intellij.openapi.roots.impl.ProjectOrderEnumerator
+import com.intellij.openapi.roots.impl.ProjectRootManagerImpl
 import com.intellij.openapi.util.Condition
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.UserDataHolderBase
@@ -31,7 +31,8 @@ import java.io.File
  * Workaround for the lack of ability to create a ProjectFileIndex implementation using only
  * classes from projectModel-{api,impl}.
  */
-class CoreProjectFileIndex(private val project: Project, contentRoots: List<ContentRoot>) : ProjectFileIndex, ModuleFileIndex {
+class CoreProjectFileIndex(private val project: Project, contentRoots: List<ContentRoot>) : ProjectFileIndex,
+    ModuleFileIndex {
     override fun iterateContent(p0: ContentIterator, p1: VirtualFileFilter?): Boolean {
         throw UnsupportedOperationException()
     }
@@ -147,8 +148,8 @@ class CoreProjectFileIndex(private val project: Project, contentRoots: List<Cont
 
     private val sdk: Sdk = object : Sdk, RootProvider {
         override fun getFiles(rootType: OrderRootType): Array<out VirtualFile> = classpathRoots
-                .mapNotNull { StandardFileSystems.local().findFileByPath(it.file.path) }
-                .toTypedArray()
+            .mapNotNull { StandardFileSystems.local().findFileByPath(it.file.path) }
+            .toTypedArray()
 
         override fun addRootSetChangedListener(p0: RootProvider.RootSetChangedListener) {
             throw UnsupportedOperationException()
@@ -334,11 +335,11 @@ class CoreProjectFileIndex(private val project: Project, contentRoots: List<Cont
         }
 
         override fun orderEntries(): OrderEnumerator =
-                ProjectOrderEnumerator(project, null).using(object : RootModelProvider {
-                    override fun getModules(): Array<out Module> = arrayOf(module)
+            ProjectRootManagerImpl(project).orderEntries().using(object : RootModelProvider {
+                override fun getModules(): Array<out Module> = arrayOf(module)
 
-                    override fun getRootModel(p0: Module): ModuleRootModel = this@MyModuleRootManager
-                })
+                override fun getRootModel(p0: Module): ModuleRootModel = this@MyModuleRootManager
+            })
 
         override fun <T : Any?> getModuleExtension(p0: Class<T>): T {
             throw UnsupportedOperationException()
@@ -418,7 +419,8 @@ class CoreProjectFileIndex(private val project: Project, contentRoots: List<Cont
     override fun isInLibrarySource(file: VirtualFile): Boolean = false
 
     override fun getClassRootForFile(file: VirtualFile): VirtualFile? =
-        classpathRoots.firstOrNull { it.contains(file) }?.let { StandardFileSystems.local().findFileByPath(it.file.path) }
+        classpathRoots.firstOrNull { it.contains(file) }
+            ?.let { StandardFileSystems.local().findFileByPath(it.file.path) }
 
     override fun getOrderEntriesForFile(file: VirtualFile): List<OrderEntry> =
         if (classpathRoots.contains(file)) listOf(sdkOrderEntry) else emptyList()
@@ -442,7 +444,7 @@ class CoreProjectFileIndex(private val project: Project, contentRoots: List<Cont
     }
 
     override fun getModuleForFile(file: VirtualFile): Module? =
-            if (sourceRoots.contains(file)) module else null
+        if (sourceRoots.contains(file)) module else null
 
     private fun List<ContentRoot>.contains(file: VirtualFile): Boolean = any { it.contains(file) }
 
diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/DokkaNativeResolverForModuleFactory.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/DokkaNativeResolverForModuleFactory.kt
index a0135d40..f849c229 100644
--- a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/DokkaNativeResolverForModuleFactory.kt
+++ b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/DokkaNativeResolverForModuleFactory.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.konan.util.KlibMetadataFactories
 import org.jetbrains.kotlin.library.metadata.NullFlexibleTypeDeserializer
 import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer
+import org.jetbrains.kotlin.resolve.SealedClassInheritorsProvider
 import org.jetbrains.kotlin.resolve.TargetEnvironment
 import org.jetbrains.kotlin.resolve.konan.platform.NativePlatformAnalyzerServices
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
@@ -31,7 +32,8 @@ internal class DokkaNativeResolverForModuleFactory(
         moduleContext: ModuleContext,
         moduleContent: ModuleContent<M>,
         resolverForProject: ResolverForProject<M>,
-        languageVersionSettings: LanguageVersionSettings
+        languageVersionSettings: LanguageVersionSettings,
+        sealedInheritorsProvider: SealedClassInheritorsProvider
     ): ResolverForModule {
 
         val declarationProviderFactory = DeclarationProviderFactoryService.createDeclarationProviderFactory(
diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/TypeReferenceFactory.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/TypeReferenceFactory.kt
index 169831d4..e62548d7 100644
--- a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/TypeReferenceFactory.kt
+++ b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/TypeReferenceFactory.kt
@@ -36,7 +36,6 @@ private fun TypeReference.Companion.fromPossiblyRecursive(t: KotlinType, paramTr
 
 private fun TypeReference.Companion.from(t: KotlinType, paramTrace: List<KotlinType>): TypeReference {
     if (t is UnresolvedType) {
-        println("Unresolved type with presentable name: ${t.presentableName}")
         return TypeConstructor(
             t.presentableName, t.arguments.map { fromProjection(it, paramTrace) }
         )