From 73f78dc34bbcb683f345192629bdbc631035887e Mon Sep 17 00:00:00 2001 From: Vadim Mishenev 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 --- integration-tests/gradle/projects/it-basic/build.gradle.kts | 4 +++- .../kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt | 2 +- .../kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'integration-tests') diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts index b2a84e5f..3f7dd32b 100644 --- a/integration-tests/gradle/projects/it-basic/build.gradle.kts +++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts @@ -12,7 +12,9 @@ plugins { buildscript { dependencies { - classpath("org.jetbrains.dokka:dokka-base:${System.getenv("DOKKA_VERSION")}") + classpath("org.jetbrains.dokka:dokka-base:${System.getenv("DOKKA_VERSION")}") { + exclude(group = "org.jetbrains.dokka", module = "dokka-analysis") // Gradle has embeddable Kotlin compiler + } } } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt index ef9d67cc..cef9fd8b 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt @@ -18,7 +18,7 @@ class JsIRGradleIntegrationTest(override val versions: BuildVersions) : Abstract // some core react classes were moved from `react-router-dom` to `react` artifacts. // Writing an integration test project that would work for both 1.4.0 and 1.5.0 would involve // ugly solutions, so these versions are ignored. Not a big loss given they are deprecated as of this moment. - "1.4.0", "1.4.32" + "1.4.0", "1.4.32", "1.7.0-RC" ) @BeforeTest diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt index b87707a4..7f2ad851 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt @@ -5,7 +5,7 @@ internal object TestedVersions { val BASE = BuildVersions.permutations( gradleVersions = listOf("7.4.2", "6.9"), - kotlinVersions = listOf("1.6.21", "1.5.31", "1.4.32"), + kotlinVersions = listOf("1.7.0-RC", "1.6.21", "1.5.31", "1.4.32"), ) + BuildVersions.permutations( gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")), kotlinVersions = listOf(*ifExhaustive("1.6.0", "1.5.0", "1.4.0")) -- cgit