fix stagingRepositoryId check (#703)

* fix stagingRepositoryId check * Revert "use new tasks" This reverts commit 21de520.
vanniktech · Jan 6, 2024 · 55c7960 · 55c7960
1 parent 21de520
commit 55c7960
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -34,7 +34,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2
 
       - name: Publish
-        run: ./gradlew publishAndReleaseToMavenCentral
+        run: ./gradlew publish
         env:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: gradle/gradle-build-action@v2
 
       - name: Publish
-        run: ./gradlew publishToMavenCentral
+        run: ./gradlew publish
         env:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}

diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,7 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx2g
 org.gradle.parallel=true
 
 SONATYPE_HOST=DEFAULT
+SONATYPE_AUTOMATIC_RELEASE=true
 RELEASE_SIGNING_ENABLED=true
 
 GROUP=com.vanniktech

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ moshi = "1.15.0"
 retrofit = "2.9.0"
 junit = "5.10.1"
 truth = "1.2.0"
-maven-publish = "0.27.0-rc1"
+maven-publish = "0.26.0"
 ktlint = "12.0.3"
 
 [libraries]

diff --git a/...n/src/main/kotlin/com/vanniktech/maven/publish/sonatype/SonatypeRepositoryBuildService.kt b/...n/src/main/kotlin/com/vanniktech/maven/publish/sonatype/SonatypeRepositoryBuildService.kt
@@ -65,7 +65,7 @@ internal abstract class SonatypeRepositoryBuildService :
 
   private var stagingRepositoryId: String? = null
     set(value) {
-      check(field != null && field != value) {
+      check(field == null || field == value) {
         "stagingRepositoryId was already set to '$field', new value '$value'"
       }
       field = value