Skip to content

Commit 7cc0002

Browse files
TapchicomaSpace
authored andcommitted
Update Gradle publish plugin to 1.0.0-rc-3 version
This should fix publishing multiple artifacts with the same hash and remove requirement of custom action from Gradle team.
1 parent 5c34d5b commit 7cc0002

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ dependencies {
163163
implementation(kotlin("stdlib", embeddedKotlinVersion))
164164
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
165165
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
166-
implementation("com.gradle.publish:plugin-publish-plugin:0.20.0")
166+
implementation("com.gradle.publish:plugin-publish-plugin:1.0.0-rc-3")
167167
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
168168

169169
implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")

buildSrc/src/main/kotlin/GradleCommon.kt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -289,22 +289,26 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
289289
}
290290
}
291291

292-
plugins.withId("org.jetbrains.dokka") {
293-
val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
294-
dokkaSourceSets {
295-
named(commonSourceSet.name) {
296-
suppress.set(false)
297-
}
292+
if (kotlinBuildProperties.publishGradlePluginsJavadoc ||
293+
kotlinBuildProperties.isTeamcityBuild
294+
) {
295+
plugins.withId("org.jetbrains.dokka") {
296+
val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
297+
dokkaSourceSets {
298+
named(commonSourceSet.name) {
299+
suppress.set(false)
300+
}
298301

299-
named("main") {
300-
dependsOn(commonSourceSet)
302+
named("main") {
303+
dependsOn(commonSourceSet)
304+
}
301305
}
302306
}
303-
}
304307

305-
tasks.withType<Jar>().configureEach {
306-
if (name == javadocJarTaskName) {
307-
from(dokkaTask.flatMap { it.outputDirectory })
308+
tasks.withType<Jar>().configureEach {
309+
if (name == javadocJarTaskName) {
310+
from(dokkaTask.flatMap { it.outputDirectory })
311+
}
308312
}
309313
}
310314
}

gradle/verification-metadata.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2120,10 +2120,10 @@
21202120
<sha256 value="f1dc5b9c242d0d90401c6287458db184978b855e12ce0c412fecad361dca0213" origin="Generated by Gradle"/>
21212121
</artifact>
21222122
</component>
2123-
<component group="com.gradle.publish" name="plugin-publish-plugin" version="0.20.0">
2124-
<artifact name="plugin-publish-plugin-0.20.0.jar">
2125-
<md5 value="7332672ea82e8ba857b8474837deae6e" origin="Generated by Gradle"/>
2126-
<sha256 value="e71dc838ada62842fb9d1ea3f64a5615d09a032adb7f7e6a9e52235e9a80e77d" origin="Generated by Gradle"/>
2123+
<component group="com.gradle.publish" name="plugin-publish-plugin" version="1.0.0-rc-3">
2124+
<artifact name="plugin-publish-plugin-1.0.0-rc-3.jar">
2125+
<md5 value="e8f8cf5cc8cab2b7df87b227772a9089" origin="Generated by Gradle"/>
2126+
<sha256 value="3441a5772dcb9461146aa59caf2eb5a665826ed393340d10b16f1346d11340c0" origin="Generated by Gradle"/>
21272127
</artifact>
21282128
</component>
21292129
<component group="com.ibm.icu" name="icu4j" version="53.1">

0 commit comments

Comments
 (0)