diff --git a/build-logic/src/main/kotlin/dokkabuild.publish-base.gradle.kts b/build-logic/src/main/kotlin/dokkabuild.publish-base.gradle.kts index f9ec1c49c3..85fca751b8 100644 --- a/build-logic/src/main/kotlin/dokkabuild.publish-base.gradle.kts +++ b/build-logic/src/main/kotlin/dokkabuild.publish-base.gradle.kts @@ -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().configureEach { val signingTasks = tasks.withType() diff --git a/build.gradle.kts b/build.gradle.kts index a86ec5aa1b..8c4239e3fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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") @@ -22,12 +22,6 @@ registerParentGroupTasks("publishing", taskNames = listOf( it.name in publishedIncludedBuilds } -registerParentGroupTasks("verification", taskNames = listOf( - "test", - "apiCheck", - "apiDump" -)) - registerParentGroupTasks("gradle plugin", taskNames = listOf( "publishPlugins", "validatePlugins" @@ -35,6 +29,18 @@ registerParentGroupTasks("gradle plugin", taskNames = listOf( 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." diff --git a/dokka-integration-tests/maven/build.gradle.kts b/dokka-integration-tests/maven/build.gradle.kts index f0607e61d7..6f2acca4b5 100644 --- a/dokka-integration-tests/maven/build.gradle.kts +++ b/dokka-integration-tests/maven/build.gradle.kts @@ -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( diff --git a/dokka-integration-tests/settings.gradle.kts b/dokka-integration-tests/settings.gradle.kts index c3a1d878e2..07f1f59d9d 100644 --- a/dokka-integration-tests/settings.gradle.kts +++ b/dokka-integration-tests/settings.gradle.kts @@ -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( diff --git a/dokka-runners/runner-gradle-classic/MIGRATION.md b/dokka-runners/runner-gradle-plugin-classic/MIGRATION.md similarity index 100% rename from dokka-runners/runner-gradle-classic/MIGRATION.md rename to dokka-runners/runner-gradle-plugin-classic/MIGRATION.md diff --git a/dokka-runners/runner-gradle-classic/api/runner-gradle-classic.api b/dokka-runners/runner-gradle-plugin-classic/api/runner-gradle-plugin-classic.api similarity index 100% rename from dokka-runners/runner-gradle-classic/api/runner-gradle-classic.api rename to dokka-runners/runner-gradle-plugin-classic/api/runner-gradle-plugin-classic.api diff --git a/dokka-runners/runner-gradle-classic/build.gradle.kts b/dokka-runners/runner-gradle-plugin-classic/build.gradle.kts similarity index 100% rename from dokka-runners/runner-gradle-classic/build.gradle.kts rename to dokka-runners/runner-gradle-plugin-classic/build.gradle.kts diff --git a/dokka-runners/runner-gradle-classic/gradle.properties b/dokka-runners/runner-gradle-plugin-classic/gradle.properties similarity index 100% rename from dokka-runners/runner-gradle-classic/gradle.properties rename to dokka-runners/runner-gradle-plugin-classic/gradle.properties diff --git a/dokka-runners/runner-gradle-classic/settings.gradle.kts b/dokka-runners/runner-gradle-plugin-classic/settings.gradle.kts similarity index 91% rename from dokka-runners/runner-gradle-classic/settings.gradle.kts rename to dokka-runners/runner-gradle-plugin-classic/settings.gradle.kts index 3549397877..24f21fe1cc 100644 --- a/dokka-runners/runner-gradle-classic/settings.gradle.kts +++ b/dokka-runners/runner-gradle-plugin-classic/settings.gradle.kts @@ -4,7 +4,7 @@ @file:Suppress("UnstableApiUsage") -rootProject.name = "runner-gradle-classic" +rootProject.name = "runner-gradle-plugin-classic" pluginManagement { includeBuild("../../build-logic") diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt diff --git a/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt b/dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt rename to dokka-runners/runner-gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt diff --git a/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt b/dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt similarity index 100% rename from dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt rename to dokka-runners/runner-gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt diff --git a/dokka-runners/runner-maven/api/runner-maven.api b/dokka-runners/runner-maven-plugin/api/runner-maven-plugin.api similarity index 100% rename from dokka-runners/runner-maven/api/runner-maven.api rename to dokka-runners/runner-maven-plugin/api/runner-maven-plugin.api diff --git a/dokka-runners/runner-maven/build.gradle.kts b/dokka-runners/runner-maven-plugin/build.gradle.kts similarity index 100% rename from dokka-runners/runner-maven/build.gradle.kts rename to dokka-runners/runner-maven-plugin/build.gradle.kts diff --git a/dokka-runners/runner-maven/gradle.properties b/dokka-runners/runner-maven-plugin/gradle.properties similarity index 100% rename from dokka-runners/runner-maven/gradle.properties rename to dokka-runners/runner-maven-plugin/gradle.properties diff --git a/dokka-runners/runner-maven/pom.template.xml b/dokka-runners/runner-maven-plugin/pom.template.xml similarity index 100% rename from dokka-runners/runner-maven/pom.template.xml rename to dokka-runners/runner-maven-plugin/pom.template.xml diff --git a/dokka-runners/runner-maven/settings.gradle.kts b/dokka-runners/runner-maven-plugin/settings.gradle.kts similarity index 92% rename from dokka-runners/runner-maven/settings.gradle.kts rename to dokka-runners/runner-maven-plugin/settings.gradle.kts index db1a16c814..63bf374367 100644 --- a/dokka-runners/runner-maven/settings.gradle.kts +++ b/dokka-runners/runner-maven-plugin/settings.gradle.kts @@ -4,7 +4,7 @@ @file:Suppress("UnstableApiUsage") -rootProject.name = "runner-maven" +rootProject.name = "runner-maven-plugin" pluginManagement { includeBuild("../../build-logic") diff --git a/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt b/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt similarity index 100% rename from dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt rename to dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt diff --git a/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt b/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt similarity index 100% rename from dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt rename to dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt diff --git a/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt b/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt similarity index 100% rename from dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt rename to dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt diff --git a/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt b/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt similarity index 100% rename from dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt rename to dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt diff --git a/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt b/dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt similarity index 100% rename from dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt rename to dokka-runners/runner-maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 29bb1a0285..ee2021e74d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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(