From 1e126789a92e512b0a426044220043632e7dbf1b Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Wed, 15 Nov 2023 23:00:53 +0300 Subject: [K2] Update version of Kotlin Analysis API (#3337) --- .../src/test/kotlin/content/exceptions/ContentForExceptions.kt | 1 - .../plugin-base/src/test/kotlin/content/params/ContentForParamsTest.kt | 1 - .../src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt | 2 -- .../kotlin/translators/DefaultDescriptorToDocumentableTranslatorTest.kt | 2 +- gradle/libs.versions.toml | 2 +- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/content/exceptions/ContentForExceptions.kt b/dokka-subprojects/plugin-base/src/test/kotlin/content/exceptions/ContentForExceptions.kt index 22becb93..e7ecb828 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/content/exceptions/ContentForExceptions.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/content/exceptions/ContentForExceptions.kt @@ -60,7 +60,6 @@ class ContentForExceptions : BaseAbstractTest() { ) } - @OnlyDescriptors("Fixed in 1.9.20 (IMPORT STAR)") @Test fun `function with navigatable thrown exception`() { testInline( diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/content/params/ContentForParamsTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/content/params/ContentForParamsTest.kt index d0c6ac9d..6656dc44 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/content/params/ContentForParamsTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/content/params/ContentForParamsTest.kt @@ -480,7 +480,6 @@ class ContentForParamsTest : BaseAbstractTest() { } } - @OnlyDescriptors("Fixed in 1.9.20 (IMPORT STAR)") @Test fun `multiline kotlin throws with comment`() { testInline( diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt index 240982c5..342ff4b3 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/filter/KotlinArrayDocumentableReplacerTest.kt @@ -13,7 +13,6 @@ import org.jetbrains.dokka.model.Invariance import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals -import utils.OnlyDescriptors class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { private val configuration = dokkaConfiguration { @@ -164,7 +163,6 @@ class KotlinArrayDocumentableReplacerTest : BaseAbstractTest() { } } - @OnlyDescriptors("Fix module.contentScope in new Standalone API") // TODO fix module.contentScope [getKtModuleForKtElement] @Test fun `no jvm source set`() { val configurationWithNoJVM = dokkaConfiguration { diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/translators/DefaultDescriptorToDocumentableTranslatorTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/translators/DefaultDescriptorToDocumentableTranslatorTest.kt index 6812f0b4..c8b72f6f 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/translators/DefaultDescriptorToDocumentableTranslatorTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/translators/DefaultDescriptorToDocumentableTranslatorTest.kt @@ -983,7 +983,7 @@ val soapXml = node("soap-env:Envelope", soapAttrs, } } - @OnlyDescriptors("Fix kdoc link") // TODO + @OnlyDescriptors("Fix kdoc link in valueOf https://github.com/Kotlin/dokka/issues/3335") // TODO @Test fun `should have documentation for synthetic Enum valueOf functions`() { testInline( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0cc09ef9..d20cb945 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ kotlinx-bcv = "0.13.2" ## Analysis kotlin-compiler = "1.9.20" -kotlin-compiler-k2 = "2.0.0-dev-5387" +kotlin-compiler-k2 = "2.0.0-dev-7674" # MUST match the version of the intellij platform used in the kotlin compiler, # otherwise this will lead to different versions of psi API and implementations -- cgit