Skip to content

Commit bf27c4f

Browse files
committed
cli integration tests
1 parent b5d971c commit bf27c4f

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

dokka-integration-tests/cli/build.gradle.kts

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
66

77
plugins {
88
id("org.jetbrains.conventions.dokka-integration-test")
9-
id("com.github.johnrengelman.shadow")
9+
alias(libs.plugins.shadow)
1010
}
1111

12-
val dokka_version: String by project
13-
evaluationDependsOn(":runners:cli")
14-
evaluationDependsOn(":plugins:base")
15-
1612
dependencies {
1713
implementation(kotlin("test-junit5"))
1814
implementation(projects.integrationTestUtilities)
@@ -25,16 +21,31 @@ val basePluginShadow: Configuration by configurations.creating {
2521
}
2622
}
2723

24+
val cliConfiguration: Configuration by configurations.creating {
25+
attributes {
26+
attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage::class.java, Usage.JAVA_RUNTIME))
27+
attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling::class.java, Bundling.SHADOWED))
28+
}
29+
// we should have single artifact here
30+
isTransitive = false
31+
}
32+
2833
dependencies {
29-
basePluginShadow(projects.plugins.base)
34+
cliConfiguration("org.jetbrains.dokka:cli")
35+
36+
basePluginShadow("org.jetbrains.dokka:plugin-base")
3037

3138
// TODO [beresnev] analysis switcher
32-
basePluginShadow(project(path = ":subprojects:analysis-kotlin-descriptors", configuration = "shadow"))
39+
basePluginShadow("org.jetbrains.dokka:analysis-kotlin-descriptors") {
40+
attributes {
41+
attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling::class.java, Bundling.SHADOWED))
42+
}
43+
}
3344
}
3445

3546
val basePluginShadowJar by tasks.register("basePluginShadowJar", ShadowJar::class) {
3647
configurations = listOf(basePluginShadow)
37-
archiveFileName.set("fat-base-plugin-$dokka_version.jar")
48+
archiveFileName.set("fat-base-plugin-${project.version}.jar")
3849
archiveClassifier.set("")
3950

4051
// service files are merged to make sure all Dokka plugins
@@ -43,10 +54,10 @@ val basePluginShadowJar by tasks.register("basePluginShadowJar", ShadowJar::clas
4354
}
4455

4556
tasks.integrationTest {
57+
dependsOn(cliConfiguration)
58+
dependsOn(basePluginShadowJar)
59+
4660
inputs.dir(file("projects"))
47-
val cliJar = tasks.getByPath(":runners:cli:shadowJar") as ShadowJar
48-
environment("CLI_JAR_PATH", cliJar.archiveFile.get())
61+
environment("CLI_JAR_PATH", cliConfiguration.singleFile)
4962
environment("BASE_PLUGIN_JAR_PATH", basePluginShadowJar.archiveFile.get())
50-
dependsOn(cliJar)
51-
dependsOn(basePluginShadowJar)
5263
}

dokka-integration-tests/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ includeBuild("../dokka-runners/maven-plugin")
3535
includeBuild("../dokka-subprojects")
3636

3737
include(
38-
// ":cli",
38+
":cli",
3939
":gradle",
4040
":maven",
4141
":integration-test-utilities",

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,4 @@ kotest-assertionsJson = { module = "io.kotest:kotest-assertions-json" }
148148

149149
kotlinx-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-bcv" }
150150
gradleNode = { id = "com.github.node-gradle.node", version.ref = "gradlePlugin-gradleNode" }
151+
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "gradlePlugin-shadow" }

0 commit comments

Comments
 (0)