azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Gradle publish plugin to 1.0.0-rc-3 version

Browse Source 
This should fix publishing multiple artifacts with the same hash and
remove requirement of custom action from Gradle team.
This commit is contained in:
Yahor Berdnikau
2022-06-24 14:33:39 +02:00
parent 0c8b31b9ed
commit 9b768d647c
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/build.gradle.kts
+1 -1
View File
@@ -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")}")
buildSrc/src/main/kotlin/GradleCommon.kt
+4
View File
@@ -287,6 +287,9 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
} }
} }
if (kotlinBuildProperties.publishGradlePluginsJavadoc ||
kotlinBuildProperties.isTeamcityBuild
) {
plugins.withId("org.jetbrains.dokka") { plugins.withId("org.jetbrains.dokka") {
val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") { val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
dokkaSourceSets { dokkaSourceSets {
@@ -307,6 +310,7 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
} }
} }
} }
}
// Fix common sources visibility for tests // Fix common sources visibility for tests
sourceSets.named(SourceSet.TEST_SOURCE_SET_NAME) { sourceSets.named(SourceSet.TEST_SOURCE_SET_NAME) {
gradle/verification-metadata.xml
+4 -4
View File
@@ -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">