From 9b07435773831874d4d80066a2227596198af988 Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Thu, 26 Oct 2023 14:39:00 +0300 Subject: [K2] Support kotlin-as-java and javadoc plugins and update version of Analysis API (#3227) * Implement InheritanceBuilder and for symbols * Enable tests for as-java and javadoc plugins and fix some * Update the version of Analysis API and enable test * Use assert from kotlin.test * Rename `descriptorInheritanceBuilder` * Fix after rebasing * Mute test `two classes from different packages` --- plugins/kotlin-as-java/build.gradle.kts | 7 ++++++- plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt | 1 + .../kotlin-as-java/src/test/kotlin/KotlinAsJavaSignatureTest.kt | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'plugins/kotlin-as-java') diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts index 19a7bf78..0b855895 100644 --- a/plugins/kotlin-as-java/build.gradle.kts +++ b/plugins/kotlin-as-java/build.gradle.kts @@ -7,6 +7,7 @@ import org.jetbrains.registerDokkaArtifactPublication plugins { id("org.jetbrains.conventions.kotlin-jvm") id("org.jetbrains.conventions.maven-publish") + id("org.jetbrains.conventions.base-unit-test") } dependencies { @@ -20,7 +21,11 @@ dependencies { testImplementation(kotlin("test")) testImplementation(libs.jsoup) testImplementation(projects.plugins.base) - testImplementation(projects.plugins.base.baseTestUtils) + symbolsTestConfiguration(project(path = ":subprojects:analysis-kotlin-symbols", configuration = "shadow")) + descriptorsTestConfiguration(project(path = ":subprojects:analysis-kotlin-descriptors", configuration = "shadow")) + testImplementation(projects.plugins.base.baseTestUtils) { + exclude(module = "analysis-kotlin-descriptors") + } testImplementation(projects.core.contentMatcherTestUtils) testImplementation(projects.core.testApi) } diff --git a/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt b/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt index f6124f88..93d5c1b5 100644 --- a/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt +++ b/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaPluginTest.kt @@ -377,6 +377,7 @@ class KotlinAsJavaPluginTest : BaseAbstractTest() { DokkaConfiguration.ExternalDocumentationLink.jdk(8), stdlibExternalDocumentationLink ) + classpath = listOfNotNull(jvmStdlibPath) } } } diff --git a/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaSignatureTest.kt b/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaSignatureTest.kt index c87fda5e..25312810 100644 --- a/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaSignatureTest.kt +++ b/plugins/kotlin-as-java/src/test/kotlin/KotlinAsJavaSignatureTest.kt @@ -23,6 +23,7 @@ class KotlinAsJavaSignatureTest : BaseAbstractTest() { DokkaConfiguration.ExternalDocumentationLink.jdk(8), stdlibExternalDocumentationLink ) + classpath = listOfNotNull(jvmStdlibPath) } } } -- cgit