From 92509ad400b6902fb8667174dcf98f6693312ce2 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 17 Jan 2023 11:48:05 +0100 Subject: [PATCH] Remove Gradle plugin variants from ':kotlin-gradle-build-metrics' Code does not use any Gradle API imports and does not use any KGP API classes. --- .../build.gradle.kts | 21 ++++++++++++++++++- .../build/metrics/GradleBuildMetricsData.kt | 0 2 files changed, 20 insertions(+), 1 deletion(-) rename libraries/tools/kotlin-gradle-build-metrics/src/{common => main}/kotlin/org/jetbrains/kotlin/gradle/internal/build/metrics/GradleBuildMetricsData.kt (100%) diff --git a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts b/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts index 3774a5db1b1..98f32e3d25b 100644 --- a/libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-build-metrics/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: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-build-metrics/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/build/metrics/GradleBuildMetricsData.kt b/libraries/tools/kotlin-gradle-build-metrics/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/build/metrics/GradleBuildMetricsData.kt similarity index 100% rename from libraries/tools/kotlin-gradle-build-metrics/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/build/metrics/GradleBuildMetricsData.kt rename to libraries/tools/kotlin-gradle-build-metrics/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/build/metrics/GradleBuildMetricsData.kt