From d4c2058b4cd4e60ea79ea6a17fff2655f48879a1 Mon Sep 17 00:00:00 2001 From: IgnatBeresnev Date: Tue, 31 Oct 2023 22:03:46 +0100 Subject: [PATCH] Rename runner included builds by moving --- build.gradle.kts | 4 ++-- dokka-integration-tests/gradle/build.gradle.kts | 2 +- dokka-integration-tests/maven/build.gradle.kts | 2 +- dokka-integration-tests/settings.gradle.kts | 6 +++--- .../{cli/api/cli.api => runner-cli/api/runner-cli.api} | 0 dokka-runners/{cli => runner-cli}/build.gradle.kts | 0 dokka-runners/{cli => runner-cli}/gradle.properties | 0 dokka-runners/{cli => runner-cli}/settings.gradle.kts | 2 +- .../src/main/kotlin/org/jetbrains/dokka/CliArgumentTypes.kt | 0 .../src/main/kotlin/org/jetbrains/dokka/GlobalArguments.kt | 0 .../src/main/kotlin/org/jetbrains/dokka/LinkMapper.kt | 0 .../main/kotlin/org/jetbrains/dokka/PackageOptionsParser.kt | 0 .../kotlin/org/jetbrains/dokka/SourceSetArgumentsParser.kt | 0 .../src/main/kotlin/org/jetbrains/dokka/main.kt | 0 .../src/test/kotlin/org/jetbrains/dokka/CliTest.kt | 0 .../src/test/resources/my-file-no-sourceset-options.json | 0 .../{cli => runner-cli}/src/test/resources/my-file.json | 0 .../MIGRATION.md | 0 .../api/runner-gradle-classic.api} | 0 .../build.gradle.kts | 0 .../gradle.properties | 0 .../settings.gradle.kts | 2 +- .../kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt | 0 .../jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt | 0 .../main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt | 0 .../main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt | 0 .../org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt | 0 .../jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt | 0 .../dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt | 0 .../dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt | 0 .../dokka/gradle/GradleExternalDocumentationLinkBuilder.kt | 0 .../jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt | 0 .../org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt | 0 .../dokka/gradle/TaskDependencyInternalWithAdditions.kt | 0 .../org/jetbrains/dokka/gradle/automagicTypedProxy.kt | 0 .../dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt | 0 .../org/jetbrains/dokka/gradle/checkDependentSourceSets.kt | 0 .../org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt | 0 .../jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt | 0 .../org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt | 0 .../org/jetbrains/dokka/gradle/gradleConfigurations.kt | 0 .../dokka/gradle/internal/AbstractDokkaTaskExtensions.kt | 0 .../dokka/gradle/kotlin/KotlinGradlePluginVersion.kt | 0 .../dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt | 0 .../jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt | 0 .../org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt | 0 .../jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt | 0 .../jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt | 0 .../jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt | 0 .../jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt | 0 .../dokka/gradle/sourceSetKotlinGistConfiguration.kt | 0 .../jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt | 0 .../jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt | 0 .../org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt | 0 .../org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt | 0 .../jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt | 0 .../kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt | 0 .../org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt | 0 .../src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt | 0 .../jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt | 0 .../jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt | 0 .../kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt | 0 .../dokka/gradle/CheckSourceSetDependenciesTest.kt | 0 .../dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt | 0 .../jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt | 0 .../dokka/gradle/DokkaConfigurationSerializableTest.kt | 0 .../dokka/gradle/DokkaMultiModuleFileLayoutTest.kt | 0 .../org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt | 0 .../jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt | 0 .../dokka/gradle/GradleDokkaSourceSetBuilderTest.kt | 0 .../dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt | 0 .../org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt | 0 .../dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt | 0 .../jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt | 0 .../dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt | 0 .../org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt | 0 .../dokka/gradle/utils/samWithReceiverWorkarounds.kt | 0 .../maven-plugin.api => runner-maven/api/runner-maven.api} | 0 .../{maven-plugin => runner-maven}/build.gradle.kts | 0 .../{maven-plugin => runner-maven}/gradle.properties | 0 .../{maven-plugin => runner-maven}/pom.template.xml | 0 .../{maven-plugin => runner-maven}/settings.gradle.kts | 2 +- .../src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt | 0 .../dokka/maven/ExternalDocumentationLinkBuilder.kt | 0 .../kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt | 0 .../main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt | 0 .../kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt | 0 settings.gradle.kts | 6 +++--- 88 files changed, 13 insertions(+), 13 deletions(-) rename dokka-runners/{cli/api/cli.api => runner-cli/api/runner-cli.api} (100%) rename dokka-runners/{cli => runner-cli}/build.gradle.kts (100%) rename dokka-runners/{cli => runner-cli}/gradle.properties (100%) rename dokka-runners/{cli => runner-cli}/settings.gradle.kts (94%) rename dokka-runners/{cli => runner-cli}/src/main/kotlin/org/jetbrains/dokka/CliArgumentTypes.kt (100%) rename dokka-runners/{cli => runner-cli}/src/main/kotlin/org/jetbrains/dokka/GlobalArguments.kt (100%) rename dokka-runners/{cli => runner-cli}/src/main/kotlin/org/jetbrains/dokka/LinkMapper.kt (100%) rename dokka-runners/{cli => runner-cli}/src/main/kotlin/org/jetbrains/dokka/PackageOptionsParser.kt (100%) rename dokka-runners/{cli => runner-cli}/src/main/kotlin/org/jetbrains/dokka/SourceSetArgumentsParser.kt (100%) rename dokka-runners/{cli => runner-cli}/src/main/kotlin/org/jetbrains/dokka/main.kt (100%) rename dokka-runners/{cli => runner-cli}/src/test/kotlin/org/jetbrains/dokka/CliTest.kt (100%) rename dokka-runners/{cli => runner-cli}/src/test/resources/my-file-no-sourceset-options.json (100%) rename dokka-runners/{cli => runner-cli}/src/test/resources/my-file.json (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/MIGRATION.md (100%) rename dokka-runners/{gradle-plugin-classic/api/gradle-plugin-classic.api => runner-gradle-classic/api/runner-gradle-classic.api} (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/build.gradle.kts (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/gradle.properties (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/settings.gradle.kts (92%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt (100%) rename dokka-runners/{gradle-plugin-classic => runner-gradle-classic}/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt (100%) rename dokka-runners/{maven-plugin/api/maven-plugin.api => runner-maven/api/runner-maven.api} (100%) rename dokka-runners/{maven-plugin => runner-maven}/build.gradle.kts (100%) rename dokka-runners/{maven-plugin => runner-maven}/gradle.properties (100%) rename dokka-runners/{maven-plugin => runner-maven}/pom.template.xml (100%) rename dokka-runners/{maven-plugin => runner-maven}/settings.gradle.kts (94%) rename dokka-runners/{maven-plugin => runner-maven}/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt (100%) rename dokka-runners/{maven-plugin => runner-maven}/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt (100%) rename dokka-runners/{maven-plugin => runner-maven}/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt (100%) rename dokka-runners/{maven-plugin => runner-maven}/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt (100%) rename dokka-runners/{maven-plugin => runner-maven}/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index eabe2e8dac..0968c76f69 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("dokkabuild.base") } -val publishedIncludedBuilds = listOf("cli", "gradle-plugin-classic", "maven-plugin") +val publishedIncludedBuilds = listOf("runner-cli", "runner-gradle-classic", "runner-maven") addDependencyOnSameTaskOfIncludedBuilds("assemble") addDependencyOnSameTaskOfIncludedBuilds("build") @@ -26,7 +26,7 @@ registerParentTaskOfPublishedIncludedBuilds("publishAllPublicationsToSpaceTestRe registerParentTaskOfPublishedIncludedBuilds("publishToMavenLocal", groupName = "publication") registerParentTaskOfIncludedBuilds("publishPlugins", groupName = "publication") { - it.name == "gradle-plugin-classic" + it.name == "runner-gradle-classic" } tasks.register("integrationTest") { diff --git a/dokka-integration-tests/gradle/build.gradle.kts b/dokka-integration-tests/gradle/build.gradle.kts index 9b007a45b5..f48920f602 100644 --- a/dokka-integration-tests/gradle/build.gradle.kts +++ b/dokka-integration-tests/gradle/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { } val dokkaSubprojects = gradle.includedBuild("dokka") -val gradlePluginClassic = gradle.includedBuild("gradle-plugin-classic") +val gradlePluginClassic = gradle.includedBuild("runner-gradle-classic") tasks.integrationTest { dependsOn( diff --git a/dokka-integration-tests/maven/build.gradle.kts b/dokka-integration-tests/maven/build.gradle.kts index 64dc89c895..aa01b258f7 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("maven-plugin") +val mavenPlugin = gradle.includedBuild("runner-maven") tasks.integrationTest { dependsOn( diff --git a/dokka-integration-tests/settings.gradle.kts b/dokka-integration-tests/settings.gradle.kts index e76732542a..c3a1d878e2 100644 --- a/dokka-integration-tests/settings.gradle.kts +++ b/dokka-integration-tests/settings.gradle.kts @@ -27,9 +27,9 @@ dependencyResolutionManagement { } } -includeBuild("../dokka-runners/gradle-plugin-classic") -includeBuild("../dokka-runners/cli") -includeBuild("../dokka-runners/maven-plugin") +includeBuild("../dokka-runners/runner-gradle-classic") +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/cli/api/cli.api b/dokka-runners/runner-cli/api/runner-cli.api similarity index 100% rename from dokka-runners/cli/api/cli.api rename to dokka-runners/runner-cli/api/runner-cli.api diff --git a/dokka-runners/cli/build.gradle.kts b/dokka-runners/runner-cli/build.gradle.kts similarity index 100% rename from dokka-runners/cli/build.gradle.kts rename to dokka-runners/runner-cli/build.gradle.kts diff --git a/dokka-runners/cli/gradle.properties b/dokka-runners/runner-cli/gradle.properties similarity index 100% rename from dokka-runners/cli/gradle.properties rename to dokka-runners/runner-cli/gradle.properties diff --git a/dokka-runners/cli/settings.gradle.kts b/dokka-runners/runner-cli/settings.gradle.kts similarity index 94% rename from dokka-runners/cli/settings.gradle.kts rename to dokka-runners/runner-cli/settings.gradle.kts index 696234e775..37b36fda47 100644 --- a/dokka-runners/cli/settings.gradle.kts +++ b/dokka-runners/runner-cli/settings.gradle.kts @@ -4,7 +4,7 @@ @file:Suppress("UnstableApiUsage") -rootProject.name = "cli" +rootProject.name = "runner-cli" pluginManagement { includeBuild("../../build-logic") diff --git a/dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/CliArgumentTypes.kt b/dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/CliArgumentTypes.kt similarity index 100% rename from dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/CliArgumentTypes.kt rename to dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/CliArgumentTypes.kt diff --git a/dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/GlobalArguments.kt b/dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/GlobalArguments.kt similarity index 100% rename from dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/GlobalArguments.kt rename to dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/GlobalArguments.kt diff --git a/dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/LinkMapper.kt b/dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/LinkMapper.kt similarity index 100% rename from dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/LinkMapper.kt rename to dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/LinkMapper.kt diff --git a/dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/PackageOptionsParser.kt b/dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/PackageOptionsParser.kt similarity index 100% rename from dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/PackageOptionsParser.kt rename to dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/PackageOptionsParser.kt diff --git a/dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/SourceSetArgumentsParser.kt b/dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/SourceSetArgumentsParser.kt similarity index 100% rename from dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/SourceSetArgumentsParser.kt rename to dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/SourceSetArgumentsParser.kt diff --git a/dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/main.kt b/dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/main.kt similarity index 100% rename from dokka-runners/cli/src/main/kotlin/org/jetbrains/dokka/main.kt rename to dokka-runners/runner-cli/src/main/kotlin/org/jetbrains/dokka/main.kt diff --git a/dokka-runners/cli/src/test/kotlin/org/jetbrains/dokka/CliTest.kt b/dokka-runners/runner-cli/src/test/kotlin/org/jetbrains/dokka/CliTest.kt similarity index 100% rename from dokka-runners/cli/src/test/kotlin/org/jetbrains/dokka/CliTest.kt rename to dokka-runners/runner-cli/src/test/kotlin/org/jetbrains/dokka/CliTest.kt diff --git a/dokka-runners/cli/src/test/resources/my-file-no-sourceset-options.json b/dokka-runners/runner-cli/src/test/resources/my-file-no-sourceset-options.json similarity index 100% rename from dokka-runners/cli/src/test/resources/my-file-no-sourceset-options.json rename to dokka-runners/runner-cli/src/test/resources/my-file-no-sourceset-options.json diff --git a/dokka-runners/cli/src/test/resources/my-file.json b/dokka-runners/runner-cli/src/test/resources/my-file.json similarity index 100% rename from dokka-runners/cli/src/test/resources/my-file.json rename to dokka-runners/runner-cli/src/test/resources/my-file.json diff --git a/dokka-runners/gradle-plugin-classic/MIGRATION.md b/dokka-runners/runner-gradle-classic/MIGRATION.md similarity index 100% rename from dokka-runners/gradle-plugin-classic/MIGRATION.md rename to dokka-runners/runner-gradle-classic/MIGRATION.md diff --git a/dokka-runners/gradle-plugin-classic/api/gradle-plugin-classic.api b/dokka-runners/runner-gradle-classic/api/runner-gradle-classic.api similarity index 100% rename from dokka-runners/gradle-plugin-classic/api/gradle-plugin-classic.api rename to dokka-runners/runner-gradle-classic/api/runner-gradle-classic.api diff --git a/dokka-runners/gradle-plugin-classic/build.gradle.kts b/dokka-runners/runner-gradle-classic/build.gradle.kts similarity index 100% rename from dokka-runners/gradle-plugin-classic/build.gradle.kts rename to dokka-runners/runner-gradle-classic/build.gradle.kts diff --git a/dokka-runners/gradle-plugin-classic/gradle.properties b/dokka-runners/runner-gradle-classic/gradle.properties similarity index 100% rename from dokka-runners/gradle-plugin-classic/gradle.properties rename to dokka-runners/runner-gradle-classic/gradle.properties diff --git a/dokka-runners/gradle-plugin-classic/settings.gradle.kts b/dokka-runners/runner-gradle-classic/settings.gradle.kts similarity index 92% rename from dokka-runners/gradle-plugin-classic/settings.gradle.kts rename to dokka-runners/runner-gradle-classic/settings.gradle.kts index d65b393a89..3549397877 100644 --- a/dokka-runners/gradle-plugin-classic/settings.gradle.kts +++ b/dokka-runners/runner-gradle-classic/settings.gradle.kts @@ -4,7 +4,7 @@ @file:Suppress("UnstableApiUsage") -rootProject.name = "gradle-plugin-classic" +rootProject.name = "runner-gradle-classic" pluginManagement { includeBuild("../../build-logic") diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaArtifacts.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayout.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaPlugin.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaProperty.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaSourceSetMapper.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderExtensions.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderFactory.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradlePackageOptionsBuilder.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/GradleSourceLinkBuilder.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/TaskDependencyInternalWithAdditions.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/automagicTypedProxy.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkChildDokkaTasksIsNotEmpty.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/checkDependentSourceSets.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaBootstrapFactory.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaDefaultOutputDirectory.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/dokkaSourceSetIDFactory.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/gradleConfigurations.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/internal/AbstractDokkaTaskExtensions.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersion.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinNativeDistributionAccessor.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinSourceSetGist.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/isMainSourceSet.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinClasspathUtils.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinSourceSetUtils.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/platformOfSourceSet.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/sourceSetKotlinGistConfiguration.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaLeafTask.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaParentTask.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/AbstractDokkaTask.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTask.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTask.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTask.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskPartial.kt diff --git a/dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt b/dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt rename to dokka-runners/runner-gradle-classic/src/main/kotlin/org/jetbrains/dokka/gradle/utils.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaParentTaskTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAutoConfigurationTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/AutomagicProxyTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/CheckSourceSetDependenciesTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/ConfigureWithKotlinSourceSetGistTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationJsonTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaConfigurationSerializableTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaMultiModuleFileLayoutTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/DokkaPluginApplyTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilder.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/GradleDokkaSourceSetBuilderTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinDslDokkaTaskConfigurationTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/kotlin/KotlinGradlePluginVersionTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaCollectorTaskTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaMultiModuleTaskTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/tasks/DokkaTaskTest.kt diff --git a/dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt b/dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt similarity index 100% rename from dokka-runners/gradle-plugin-classic/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt rename to dokka-runners/runner-gradle-classic/src/test/kotlin/org/jetbrains/dokka/gradle/utils/samWithReceiverWorkarounds.kt diff --git a/dokka-runners/maven-plugin/api/maven-plugin.api b/dokka-runners/runner-maven/api/runner-maven.api similarity index 100% rename from dokka-runners/maven-plugin/api/maven-plugin.api rename to dokka-runners/runner-maven/api/runner-maven.api diff --git a/dokka-runners/maven-plugin/build.gradle.kts b/dokka-runners/runner-maven/build.gradle.kts similarity index 100% rename from dokka-runners/maven-plugin/build.gradle.kts rename to dokka-runners/runner-maven/build.gradle.kts diff --git a/dokka-runners/maven-plugin/gradle.properties b/dokka-runners/runner-maven/gradle.properties similarity index 100% rename from dokka-runners/maven-plugin/gradle.properties rename to dokka-runners/runner-maven/gradle.properties diff --git a/dokka-runners/maven-plugin/pom.template.xml b/dokka-runners/runner-maven/pom.template.xml similarity index 100% rename from dokka-runners/maven-plugin/pom.template.xml rename to dokka-runners/runner-maven/pom.template.xml diff --git a/dokka-runners/maven-plugin/settings.gradle.kts b/dokka-runners/runner-maven/settings.gradle.kts similarity index 94% rename from dokka-runners/maven-plugin/settings.gradle.kts rename to dokka-runners/runner-maven/settings.gradle.kts index b265e78f99..db1a16c814 100644 --- a/dokka-runners/maven-plugin/settings.gradle.kts +++ b/dokka-runners/runner-maven/settings.gradle.kts @@ -4,7 +4,7 @@ @file:Suppress("UnstableApiUsage") -rootProject.name = "maven-plugin" +rootProject.name = "runner-maven" pluginManagement { includeBuild("../../build-logic") diff --git a/dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt b/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt similarity index 100% rename from dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt rename to dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/DokkaMojo.kt diff --git a/dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt b/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt similarity index 100% rename from dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt rename to dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/ExternalDocumentationLinkBuilder.kt diff --git a/dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt b/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt similarity index 100% rename from dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt rename to dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/MavenDokkaLogger.kt diff --git a/dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt b/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt similarity index 100% rename from dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt rename to dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/PackageOptions.kt diff --git a/dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt b/dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt similarity index 100% rename from dokka-runners/maven-plugin/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt rename to dokka-runners/runner-maven/src/main/kotlin/org/jetbrains/dokka/maven/SourceLinkMapItem.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 9780118df6..29bb1a0285 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -59,9 +59,9 @@ plugins { } includeBuild("dokka-integration-tests") -includeBuild("dokka-runners/gradle-plugin-classic") -includeBuild("dokka-runners/maven-plugin") -includeBuild("dokka-runners/cli") +includeBuild("dokka-runners/runner-gradle-classic") +includeBuild("dokka-runners/runner-maven") +includeBuild("dokka-runners/runner-cli") include( ":docs-developer",