Merge branch 'master' into dev

RADAR-base · Sep 13, 2023 · 9b666de · 9b666de
2 parents a99a3e9 + 339d67f
commit 9b666de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -57,4 +57,4 @@ jobs:
  env:
  OSSRH_USER: ${{ secrets.OSSRH_USER }}
  OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
- run: ./gradlew -Psigning.gnupg.keyName=CBEF2CF0 -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} :radar-commons-gradle:publish
+ run: ./gradlew -Psigning.gnupg.keyName=CBEF2CF0 -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} :radar-commons-gradle:publish :radar-commons-gradle:closeAndReleaseSonatypeStagingRepository
diff --git a/radar-commons-gradle/build.gradle.kts b/radar-commons-gradle/build.gradle.kts
@@ -90,6 +90,8 @@ val dokkaJar by tasks.registering(Jar::class) {
 tasks.withType<GenerateMavenPom> {
  afterEvaluate {
  pom.apply {
+ name.set(project.name)
+ url.set(githubUrl)
  description.set(project.description)
  licenses {
  license {
@@ -159,7 +161,7 @@ signing {
 }
 
 tasks.withType<Sign> {
- onlyIf { gradle.taskGraph.hasTask(project.tasks["publish"]) }
+ onlyIf { gradle.taskGraph.hasTask(project.tasks["publishToSonatype"]) }
  dependsOn(sourcesJar)
  dependsOn(dokkaJar)
 }