Skip to content

Commit

Permalink
Rename runner included builds
Browse files Browse the repository at this point in the history
  • Loading branch information
IgnatBeresnev committed Nov 9, 2023
1 parent b0f2297 commit 496c0e3
Show file tree
Hide file tree
Showing 75 changed files with 23 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ signing {
// This is a hack for a Gradle 8 problem, see https://github.com/gradle/gradle/issues/26091
//
// Fails with the following error otherwise:
// > Task ':runner-gradle-classic:publishDokkaPluginMarkerMavenPublicationToSpaceTestRepository' uses
// > this output of task ':runner-gradle-classic:signPluginMavenPublication' without declaring an
// > Task ':runner-gradle-plugin-classic:publishDokkaPluginMarkerMavenPublicationToSpaceTestRepository' uses
// > this output of task ':runner-gradle-plugin-classic:signPluginMavenPublication' without declaring an
// > explicit or implicit dependency.
tasks.withType<AbstractPublishToMaven>().configureEach {
val signingTasks = tasks.withType<Sign>()
Expand Down
22 changes: 14 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ plugins {
id("dokkabuild.base")
}

val publishedIncludedBuilds = listOf("runner-cli", "runner-gradle-classic", "runner-maven")
val gradlePluginIncludedBuilds = listOf("runner-gradle-classic")
val publishedIncludedBuilds = listOf("runner-cli", "runner-gradle-plugin-classic", "runner-maven-plugin")
val gradlePluginIncludedBuilds = listOf("runner-gradle-plugin-classic")

addDependencyOnSameTasksOfIncludedBuilds("assemble", "build", "clean", "check")

Expand All @@ -22,19 +22,25 @@ registerParentGroupTasks("publishing", taskNames = listOf(
it.name in publishedIncludedBuilds
}

registerParentGroupTasks("verification", taskNames = listOf(
"test",
"apiCheck",
"apiDump"
))

registerParentGroupTasks("gradle plugin", taskNames = listOf(
"publishPlugins",
"validatePlugins"
)) {
it.name in gradlePluginIncludedBuilds
}

registerParentGroupTasks("bcv", taskNames = listOf(
"apiDump",
"apiCheck",
"apiBuild"
)) {
it.name in publishedIncludedBuilds
}

registerParentGroupTasks("verification", taskNames = listOf(
"test"
))

tasks.register("integrationTest") {
group = "verification"
description = "Runs integration tests of this project. Might take a while and require additional setup."
Expand Down
2 changes: 1 addition & 1 deletion dokka-integration-tests/maven/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
}

val dokkaSubprojects = gradle.includedBuild("dokka")
val mavenPlugin = gradle.includedBuild("runner-maven")
val mavenPlugin = gradle.includedBuild("runner-maven-plugin")

tasks.integrationTest {
dependsOn(
Expand Down
4 changes: 2 additions & 2 deletions dokka-integration-tests/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ dependencyResolutionManagement {
}
}

includeBuild("../dokka-runners/runner-gradle-classic")
includeBuild("../dokka-runners/runner-gradle-plugin-classic")
includeBuild("../dokka-runners/runner-maven-plugin")
includeBuild("../dokka-runners/runner-cli")
includeBuild("../dokka-runners/runner-maven")
includeBuild("../.") // include the very root aggregating build so that we can depend on its tasks

include(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@file:Suppress("UnstableApiUsage")

rootProject.name = "runner-gradle-classic"
rootProject.name = "runner-gradle-plugin-classic"

pluginManagement {
includeBuild("../../build-logic")
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@file:Suppress("UnstableApiUsage")

rootProject.name = "runner-maven"
rootProject.name = "runner-maven-plugin"

pluginManagement {
includeBuild("../../build-logic")
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ plugins {
}

includeBuild("dokka-integration-tests")
includeBuild("dokka-runners/runner-gradle-classic")
includeBuild("dokka-runners/runner-maven")
includeBuild("dokka-runners/runner-gradle-plugin-classic")
includeBuild("dokka-runners/runner-maven-plugin")
includeBuild("dokka-runners/runner-cli")

include(
Expand Down

0 comments on commit 496c0e3

Please sign in to comment.