Skip to content

Commit 709378d

Browse files
committed
Revert "Update publish-plugin to published signed plugin artifacts (#295)"
This reverts commit e9becb5.
1 parent 96d5bc3 commit 709378d

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ kotlinx-binaryCompatibilityValidator = "0.16.2"
77
kotlinx-teamInfra = "0.4.0-dev-85"
88
squareup-kotlinpoet = "1.3.0"
99
jmh = "1.37"
10-
gradle-pluginPublish = "1.3.1"
10+
gradle-pluginPublish = "0.21.0"
1111

1212
# Note: This version can be overridden by passing `-Pmin_supported_gradle_version=<version>`
1313
minSupportedGradle = "7.6.3"

plugin/build.gradle.kts

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,19 @@ repositories {
5252
}
5353
}
5454

55-
gradlePlugin {
55+
pluginBundle {
5656
website = "https://github.com/Kotlin/kotlinx-benchmark"
5757
vcsUrl = "https://github.com/Kotlin/kotlinx-benchmark.git"
58+
tags = listOf("benchmarking", "multiplatform", "kotlin")
59+
}
5860

61+
gradlePlugin {
5962
plugins {
6063
register("benchmarkPlugin") {
6164
id = "org.jetbrains.kotlinx.benchmark"
6265
implementationClass = "kotlinx.benchmark.gradle.BenchmarksPlugin"
6366
displayName = "Gradle plugin for benchmarking"
6467
description = "Toolkit for running benchmarks for multiplatform Kotlin code."
65-
tags.set(listOf("benchmarking", "multiplatform", "kotlin"))
6668
}
6769
}
6870
}
@@ -180,19 +182,6 @@ if (project.findProperty("publication_repository") == "space") {
180182
}
181183
}
182184

183-
// Both kotlinx.team.infra and Gradle publish plugins register their own javadocJar artifacts.
184-
// We remove one of them here to avoid the collision leading to a build failure.
185-
tasks.withType<AbstractPublishToMaven>().configureEach {
186-
doFirst {
187-
this as AbstractPublishToMaven
188-
val artifactsSet = publication.artifacts
189-
val javadocJars = artifactsSet.filter { it.classifier == "javadoc" }.toList()
190-
javadocJars.drop(1).forEach {
191-
artifactsSet.remove(it)
192-
}
193-
}
194-
}
195-
196185
apiValidation {
197186
nonPublicMarkers += listOf("kotlinx.benchmark.gradle.internal.KotlinxBenchmarkPluginInternalApi")
198187
}

0 commit comments

Comments
 (0)