From 73f78dc34bbcb683f345192629bdbc631035887e Mon Sep 17 00:00:00 2001
From: Vadim Mishenev <vad-mishenev@yandex.ru>
Date: Tue, 31 May 2022 23:57:28 +0300
Subject: Bump Kotlin to 1.7.0-RC (#2508)

* `UnresolvedType` is replaced with `ErrorType` in https://github.com/JetBrains/kotlin/commit/b5933c70e20a0dfd788d8d4a6c04ca0d16f7c731

*  Support `sig` files in https://github.com/JetBrains/kotlin/commit/22b368849338cae684601c9b1ead31ebb1fd81cf

* `org.jetbrains.kotlin.idea.kdoc.resolveKDocSampleLink` is removed in https://github.com/JetBrains/intellij-community/commit/e4af6f96c8d4e2318d04eddf658a4c4e8c60b2e6

* `org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName` is deprecated

* `org.codehaus.plexus.archiver.AbstractArchiver.addDirectory` is deprecated https://codehaus-plexus.github.io/plexus-archiver/apidocs/org/codehaus/plexus/archiver/Archiver.html#addDirectory-java.io.File-java.lang.String:A-java.lang.String:A-

* Make `clean` independent from `setupMaven`

* Set up JDK classpath roots explicitly

because of https://github.com/JetBrains/kotlin/commit/f89765eb33dd95c8de33a919cca83651b326b246

* Add JPS model and faxml dependencies

* Fix test

* Exclude compiler from buildscript in integration test

* Exclude `com.intellij` package from compiler

* Update kotlin version in integration tests
---
 .../kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt | 1 -
 .../main/kotlin/transformers/pages/samples/SamplesTransformer.kt   | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/base/src/main/kotlin/transformers')

diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt
index c5b0f221..49ddd0a5 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt
@@ -2,7 +2,6 @@ package org.jetbrains.dokka.base.transformers.pages.samples
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.dokka.plugability.DokkaContext
-import org.jetbrains.kotlin.idea.kdoc.resolveKDocSampleLink
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtDeclarationWithBody
 import org.jetbrains.kotlin.psi.KtFile
diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
index db133bb8..9c78972a 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
@@ -18,7 +18,7 @@ import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.plugin
 import org.jetbrains.dokka.plugability.querySingle
 import org.jetbrains.dokka.transformers.pages.PageTransformer
-import org.jetbrains.kotlin.idea.kdoc.resolveKDocSampleLink
+import org.jetbrains.kotlin.idea.kdoc.resolveKDocLink
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
@@ -55,7 +55,7 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
             .querySingle { kotlinAnalysis }[sourceSet] // from sourceSet.sourceRoots
         else AnalysisEnvironment(DokkaMessageCollector(context.logger), sourceSet.analysisPlatform).run {
             if (analysisPlatform == Platform.jvm) {
-                addClasspath(PathUtil.getJdkClassesRootsFromCurrentJre())
+                configureJdkClasspathRoots()
             }
             sourceSet.classpath.forEach(::addClasspath)
 
@@ -124,10 +124,11 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
         val packageName = functionName.takeWhile { it != '.' }
         val descriptor = resolutionFacade.resolveSession.getPackageFragment(FqName(packageName))
             ?: return null.also { context.logger.warn("Cannot find descriptor for package $packageName") }
-        val symbol = resolveKDocSampleLink(
+        val symbol = resolveKDocLink(
             BindingContext.EMPTY,
             resolutionFacade,
             descriptor,
+            null,
             functionName.split(".")
         ).firstOrNull() ?: return null.also { context.logger.warn("Unresolved function $functionName in @sample") }
         return DescriptorToSourceUtils.descriptorToDeclaration(symbol)
-- 
cgit