diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/all-modules-page/build.gradle.kts | 1 | ||||
| -rw-r--r-- | plugins/base/build.gradle.kts | 4 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt | 16 | ||||
| -rw-r--r-- | plugins/base/src/test/kotlin/signatures/SignatureTest.kt | 2 | ||||
| -rw-r--r-- | plugins/javadoc/build.gradle.kts | 1 | ||||
| -rw-r--r-- | plugins/kotlin-as-java/build.gradle.kts | 2 |
6 files changed, 23 insertions, 3 deletions
diff --git a/plugins/all-modules-page/build.gradle.kts b/plugins/all-modules-page/build.gradle.kts index ff9fcbd8..f993d45c 100644 --- a/plugins/all-modules-page/build.gradle.kts +++ b/plugins/all-modules-page/build.gradle.kts @@ -5,6 +5,7 @@ registerDokkaArtifactPublication("dokkaAllModulesPage") { } dependencies { + compileOnly(project(":kotlin-analysis")) implementation(project(":plugins:base")) implementation(project(":plugins:templating")) testImplementation(project(":plugins:base")) diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts index e77d271e..91684ece 100644 --- a/plugins/base/build.gradle.kts +++ b/plugins/base/build.gradle.kts @@ -5,7 +5,7 @@ dependencies { val coroutines_version: String by project implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") - api(project(":kotlin-analysis")) + compileOnly(project(":kotlin-analysis")) val jsoup_version: String by project implementation("org.jsoup:jsoup:$jsoup_version") @@ -20,6 +20,8 @@ dependencies { val kotlinx_html_version: String by project implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version") + + testImplementation(project(":kotlin-analysis")) } val projectDistDir = project(":plugins:base:frontend").file("dist") diff --git a/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt b/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt index 1e0a5404..66d84967 100644 --- a/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt +++ b/plugins/base/src/test/kotlin/signatures/FunctionalTypeConstructorsSignatureTest.kt @@ -9,6 +9,7 @@ import utils.A import utils.Span import utils.TestOutputWriterPlugin import utils.match +import java.lang.IllegalStateException class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() { private val configuration = dokkaConfiguration { @@ -24,6 +25,19 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() { } } + private val jvmConfiguration = dokkaConfiguration { + sourceSets { + sourceSet { + sourceRoots = listOf("src/") + classpath = listOf(jvmStdlibPath ?: throw IllegalStateException("JVM stdlib is not found")) + externalDocumentationLinks = listOf( + stdlibExternalDocumentationLink, + DokkaConfiguration.ExternalDocumentationLink.Companion.jdk(8) + ) + } + } + } + fun source(signature: String) = """ |/src/main/kotlin/test/Test.kt @@ -282,7 +296,7 @@ class FunctionalTypeConstructorsSignatureTest : BaseAbstractTest() { testInline( source, - configuration, + jvmConfiguration, pluginOverrides = listOf(writerPlugin) ) { renderingStage = { _, _ -> diff --git a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt index 75c199fa..59665b8c 100644 --- a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt +++ b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt @@ -15,7 +15,7 @@ class SignatureTest : BaseAbstractTest() { sourceSets { sourceSet { sourceRoots = listOf("src/") - classpath = listOf(commonStdlibPath!!) + classpath = listOf(commonStdlibPath ?: throw IllegalStateException("Common stdlib is not found"), jvmStdlibPath ?: throw IllegalStateException("JVM stdlib is not found")) externalDocumentationLinks = listOf(stdlibExternalDocumentationLink) } } diff --git a/plugins/javadoc/build.gradle.kts b/plugins/javadoc/build.gradle.kts index 2b218aa2..471e4dda 100644 --- a/plugins/javadoc/build.gradle.kts +++ b/plugins/javadoc/build.gradle.kts @@ -1,6 +1,7 @@ import org.jetbrains.registerDokkaArtifactPublication dependencies { + compileOnly(project(":kotlin-analysis")) implementation("com.soywiz.korlibs.korte:korte-jvm:2.7.0") implementation(project(":plugins:base")) implementation(project(":plugins:kotlin-as-java")) diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts index 5cfc3d22..fb20d659 100644 --- a/plugins/kotlin-as-java/build.gradle.kts +++ b/plugins/kotlin-as-java/build.gradle.kts @@ -1,12 +1,14 @@ import org.jetbrains.registerDokkaArtifactPublication dependencies { + compileOnly(project(":kotlin-analysis")) implementation(project(":plugins:base")) testImplementation(project(":plugins:base")) testImplementation(project(":plugins:base:base-test-utils")) testImplementation(project(":core:content-matcher-test-utils")) val jsoup_version: String by project testImplementation("org.jsoup:jsoup:$jsoup_version") + testImplementation(project(":kotlin-analysis")) } registerDokkaArtifactPublication("kotlinAsJavaPlugin") { |