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.
This commit is contained in:
@@ -166,7 +166,7 @@ dependencies {
|
|||||||
implementation(kotlin("stdlib", embeddedKotlinVersion))
|
implementation(kotlin("stdlib", embeddedKotlinVersion))
|
||||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
|
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
|
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
|
||||||
implementation("com.gradle.publish:plugin-publish-plugin:0.20.0")
|
implementation("com.gradle.publish:plugin-publish-plugin:1.0.0-rc-3")
|
||||||
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
|
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
|
||||||
|
|
||||||
implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
|
implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
|
||||||
|
|||||||
@@ -287,22 +287,26 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins.withId("org.jetbrains.dokka") {
|
if (kotlinBuildProperties.publishGradlePluginsJavadoc ||
|
||||||
val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
|
kotlinBuildProperties.isTeamcityBuild
|
||||||
dokkaSourceSets {
|
) {
|
||||||
named(commonSourceSet.name) {
|
plugins.withId("org.jetbrains.dokka") {
|
||||||
suppress.set(false)
|
val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
|
||||||
}
|
dokkaSourceSets {
|
||||||
|
named(commonSourceSet.name) {
|
||||||
|
suppress.set(false)
|
||||||
|
}
|
||||||
|
|
||||||
named("main") {
|
named("main") {
|
||||||
dependsOn(commonSourceSet)
|
dependsOn(commonSourceSet)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType<Jar>().configureEach {
|
tasks.withType<Jar>().configureEach {
|
||||||
if (name == javadocJarTaskName) {
|
if (name == javadocJarTaskName) {
|
||||||
from(dokkaTask.flatMap { it.outputDirectory })
|
from(dokkaTask.flatMap { it.outputDirectory })
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2110,10 +2110,10 @@
|
|||||||
<sha256 value="d4b1fb131e50a0579400bf915066e7dd03ad856e5d5bd0556bdde3df0654449e" origin="Generated by Gradle"/>
|
<sha256 value="d4b1fb131e50a0579400bf915066e7dd03ad856e5d5bd0556bdde3df0654449e" origin="Generated by Gradle"/>
|
||||||
</artifact>
|
</artifact>
|
||||||
</component>
|
</component>
|
||||||
<component group="com.gradle.publish" name="plugin-publish-plugin" version="0.20.0">
|
<component group="com.gradle.publish" name="plugin-publish-plugin" version="1.0.0-rc-3">
|
||||||
<artifact name="plugin-publish-plugin-0.20.0.jar">
|
<artifact name="plugin-publish-plugin-1.0.0-rc-3.jar">
|
||||||
<md5 value="7332672ea82e8ba857b8474837deae6e" origin="Generated by Gradle"/>
|
<md5 value="e8f8cf5cc8cab2b7df87b227772a9089" origin="Generated by Gradle"/>
|
||||||
<sha256 value="e71dc838ada62842fb9d1ea3f64a5615d09a032adb7f7e6a9e52235e9a80e77d" origin="Generated by Gradle"/>
|
<sha256 value="3441a5772dcb9461146aa59caf2eb5a665826ed393340d10b16f1346d11340c0" origin="Generated by Gradle"/>
|
||||||
</artifact>
|
</artifact>
|
||||||
</component>
|
</component>
|
||||||
<component group="com.ibm.icu" name="icu4j" version="53.1">
|
<component group="com.ibm.icu" name="icu4j" version="53.1">
|
||||||
|
|||||||
Reference in New Issue
Block a user