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("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
|
||||
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("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
|
||||
|
||||
@@ -287,22 +287,26 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
|
||||
}
|
||||
}
|
||||
|
||||
plugins.withId("org.jetbrains.dokka") {
|
||||
val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
|
||||
dokkaSourceSets {
|
||||
named(commonSourceSet.name) {
|
||||
suppress.set(false)
|
||||
}
|
||||
if (kotlinBuildProperties.publishGradlePluginsJavadoc ||
|
||||
kotlinBuildProperties.isTeamcityBuild
|
||||
) {
|
||||
plugins.withId("org.jetbrains.dokka") {
|
||||
val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
|
||||
dokkaSourceSets {
|
||||
named(commonSourceSet.name) {
|
||||
suppress.set(false)
|
||||
}
|
||||
|
||||
named("main") {
|
||||
dependsOn(commonSourceSet)
|
||||
named("main") {
|
||||
dependsOn(commonSourceSet)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType<Jar>().configureEach {
|
||||
if (name == javadocJarTaskName) {
|
||||
from(dokkaTask.flatMap { it.outputDirectory })
|
||||
tasks.withType<Jar>().configureEach {
|
||||
if (name == javadocJarTaskName) {
|
||||
from(dokkaTask.flatMap { it.outputDirectory })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user