From 5c8b8bf00968edb6da4bccbe4e980462afd8d684 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 17 Jan 2023 12:00:42 +0100 Subject: [PATCH] Remove Gradle plugin variants from ':kotlin-gradle-statistics' Code does not use any Gradle API imports and does not use any KGP API classes. --- .../kotlin-gradle-statistics/build.gradle.kts | 21 ++++++++++++++++++- .../kotlin/statistics/AnonymizerUtils.kt | 0 .../kotlin/statistics/BuildSession.kt | 0 .../kotlin/statistics/BuildSessionLogger.kt | 0 .../fileloggers/FileRecordLogger.kt | 0 .../statistics/fileloggers/IRecordLogger.kt | 0 .../fileloggers/MetricsContainer.kt | 0 .../fileloggers/NullRecordLogger.kt | 0 .../statistics/metrics/BooleanMetrics.kt | 0 .../statistics/metrics/MetricContainers.kt | 0 .../statistics/metrics/MetricPolicies.kt | 0 .../statistics/metrics/NumericalMetrics.kt | 0 .../statistics/metrics/StatisticsValues.kt | 0 .../statistics/metrics/StringMetrics.kt | 0 14 files changed, 20 insertions(+), 1 deletion(-) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/BuildSession.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/fileloggers/FileRecordLogger.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/fileloggers/IRecordLogger.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/fileloggers/MetricsContainer.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/fileloggers/NullRecordLogger.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/metrics/BooleanMetrics.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricContainers.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricPolicies.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/metrics/NumericalMetrics.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/metrics/StatisticsValues.kt (100%) rename libraries/tools/kotlin-gradle-statistics/src/{common => main}/kotlin/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt (100%) diff --git a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts index acaeba141e4..47ff0ca63ca 100644 --- a/libraries/tools/kotlin-gradle-statistics/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-statistics/build.gradle.kts @@ -1,11 +1,22 @@ +import plugins.KotlinBuildPublishingPlugin.Companion.DEFAULT_MAIN_PUBLICATION_NAME +import plugins.signLibraryPublication + description = "kotlin-gradle-statistics" plugins { - id("gradle-plugin-dependency-configuration") + `java-library` + id("org.jetbrains.kotlin.jvm") id("jps-compatible") + `maven-publish` } +configureKotlinCompileTasksGradleCompatibility() +configureCommonPublicationSettingsForGradle(signLibraryPublication) +extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false" + dependencies { + compileOnly(kotlinStdlib()) + testImplementation(project(":kotlin-test:kotlin-test-junit")) testImplementation(commonDependency("junit")) } @@ -13,3 +24,11 @@ dependencies { projectTest { workingDir = rootDir } + +publishing { + publications { + register(DEFAULT_MAIN_PUBLICATION_NAME) { + from(components["java"]) + } + } +} diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/AnonymizerUtils.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/BuildSession.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/BuildSession.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/BuildSession.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/BuildSession.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/BuildSessionLogger.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/fileloggers/FileRecordLogger.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/fileloggers/FileRecordLogger.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/fileloggers/FileRecordLogger.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/fileloggers/FileRecordLogger.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/fileloggers/IRecordLogger.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/fileloggers/IRecordLogger.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/fileloggers/IRecordLogger.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/fileloggers/IRecordLogger.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/fileloggers/MetricsContainer.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/fileloggers/MetricsContainer.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/fileloggers/MetricsContainer.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/fileloggers/MetricsContainer.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/fileloggers/NullRecordLogger.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/fileloggers/NullRecordLogger.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/fileloggers/NullRecordLogger.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/fileloggers/NullRecordLogger.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/BooleanMetrics.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/BooleanMetrics.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/BooleanMetrics.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/BooleanMetrics.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricContainers.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricContainers.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricContainers.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricContainers.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricPolicies.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricPolicies.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricPolicies.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/MetricPolicies.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/NumericalMetrics.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/NumericalMetrics.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/NumericalMetrics.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/NumericalMetrics.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/StatisticsValues.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/StatisticsValues.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/StatisticsValues.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/StatisticsValues.kt diff --git a/libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt b/libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt similarity index 100% rename from libraries/tools/kotlin-gradle-statistics/src/common/kotlin/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt rename to libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt