Bump to Kotlin 1.5.31

Update JDKs to 17, kotlin to 1.5.31 in integration tests
Kotlin · Sep 30, 2021 · 16423a0 · 16423a0
1 parent 755c0df
commit 16423a0
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 606 deletions.
diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml
@@ -6,7 +6,7 @@ jobs:
   test-ubuntu:
     strategy:
       matrix:
-        version: [ 8, 11, 15, 16 ]
+        version: [ 8, 11, 17 ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
   test-windows:
     strategy:
       matrix:
-        version: [ 11, 15, 16 ]
+        version: [ 11, 15, 17 ]
       fail-fast: false
     runs-on: windows-latest
     steps:

diff --git a/gradle.properties b/gradle.properties
@@ -3,12 +3,12 @@ dokka_version_base=1.5.30
 dokka_publication_channels=maven-central-snapshot&space-dokka-dev
 dokka_integration_test_parallelism=2
 # Versions
-kotlin_version=1.5.30
+kotlin_version=1.5.31
 coroutines_version=1.5.1
 kotlinx_html_version=0.7.3
-kotlin_plugin_version=202-1.5.30-release-412-IJ8194.7
+kotlin_plugin_version=211-1.5.31-release-551-IJ7442.40
 jsoup_version=1.13.1
-idea_version=202.8194.7
+idea_version=211.7442.40
 language_version=1.4
 jackson_version=2.12.4
 # Code style

diff --git a/...src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt b/...src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt
@@ -21,7 +21,7 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
             androidGradlePluginVersions = listOf("4.0.0")
         ) + BuildVersions.permutations(
             gradleVersions = listOf("7.0"),
-            kotlinVersions = listOf("1.5.30", *ifExhaustive("1.4.0", "1.3.72")),
+            kotlinVersions = listOf("1.5.31", *ifExhaustive("1.4.0", "1.3.72")),
             androidGradlePluginVersions = listOf("4.2.0")
         )
     }

diff --git a/...le/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt b/...le/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt
@@ -12,7 +12,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac
         @get:Parameters(name = "{0}")
         val versions = BuildVersions.permutations(
             gradleVersions = listOf("7.2", *ifExhaustive("7.0", "6.6", "6.3", "6.2.2", "6.1.1")),
-            kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.30")
+            kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"), "1.5.0", "1.5.31")
         ) + BuildVersions.permutations(
             gradleVersions = listOf("5.6.4", "6.0"),
             kotlinVersions = listOf("1.3.30", *ifExhaustive("1.3.72", "1.4.32"))

diff --git a/...e/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt b/...e/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt
@@ -11,7 +11,7 @@ class MultiModule0IntegrationTest(override val versions: BuildVersions) : Abstra
         @get:Parameterized.Parameters(name = "{0}")
         val versions = BuildVersions.permutations(
             gradleVersions = listOf("7.2", "7.0", "6.6", "6.1.1"),
-            kotlinVersions = listOf("1.5.30", "1.5.0", "1.4.0")
+            kotlinVersions = listOf("1.5.31", "1.5.0", "1.4.0")
         )
     }
 

diff --git a/...le/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt b/...le/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt
@@ -12,7 +12,7 @@ class Versioning0IntegrationTest(override val versions: BuildVersions) : Abstrac
         @get:Parameterized.Parameters(name = "{0}")
         val versions = BuildVersions.permutations(
             gradleVersions = listOf("7.0", "7.2"),
-            kotlinVersions = listOf("1.5.30", "1.5.0")
+            kotlinVersions = listOf("1.5.31", "1.5.0")
         )
     }
 

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
@@ -1,20 +1,16 @@
 package org.jetbrains.dokka.analysis
 
 import com.intellij.core.CoreApplicationEnvironment
-import com.intellij.core.CoreModuleManager
 import com.intellij.mock.MockApplication
 import com.intellij.mock.MockComponentManager
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.extensions.Extensions
-import com.intellij.openapi.module.Module
-import com.intellij.openapi.module.ModuleManager
 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.util.Disposer
 import com.intellij.openapi.vfs.StandardFileSystems
+import com.intellij.psi.PsiNameHelper
+import com.intellij.psi.impl.PsiNameHelperImpl
 import com.intellij.psi.impl.source.javadoc.JavadocManagerImpl
 import com.intellij.psi.javadoc.CustomJavadocTagProvider
 import com.intellij.psi.javadoc.JavadocManager
@@ -39,10 +35,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
-import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoot
-import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
-import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
-import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots
+import org.jetbrains.kotlin.cli.jvm.config.*
 import org.jetbrains.kotlin.cli.jvm.index.JavaRoot
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.context.ProjectContext
@@ -113,25 +106,6 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
         val environment = KotlinCoreEnvironment.createForProduction(this, configuration, configFiles)
         val projectComponentManager = environment.project as MockComponentManager
 
-        val projectFileIndex = CoreProjectFileIndex(
-            environment.project,
-            environment.configuration.getList(CLIConfigurationKeys.CONTENT_ROOTS)
-        )
-
-        val moduleManager = object : CoreModuleManager(environment.project, this) {
-            override fun getModules(): Array<out Module> = arrayOf(projectFileIndex.module)
-        }
-
-        CoreApplicationEnvironment.registerComponentInstance(
-            projectComponentManager.picoContainer,
-            ModuleManager::class.java, moduleManager
-        )
-
-        CoreApplicationEnvironment.registerExtensionPoint(
-            Extensions.getRootArea(),
-            OrderEnumerationHandler.EP_NAME, OrderEnumerationHandler.Factory::class.java
-        )
-
         CoreApplicationEnvironment.registerExtensionPoint(
             environment.project.extensionArea,
             JavadocTagInfo.EP_NAME, JavadocTagInfo::class.java
@@ -150,18 +124,13 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
         }
 
         projectComponentManager.registerService(
-            ProjectFileIndex::class.java,
-            projectFileIndex
-        )
-
-        projectComponentManager.registerService(
-            ProjectRootManager::class.java,
-            CoreProjectRootManager(projectFileIndex)
+            JavadocManager::class.java,
+            JavadocManagerImpl(environment.project)
         )
 
         projectComponentManager.registerService(
-            JavadocManager::class.java,
-            JavadocManagerImpl(environment.project)
+            PsiNameHelper::class.java,
+            PsiNameHelperImpl(environment.project)
         )
 
         projectComponentManager.registerService(