Merge pull request #370 from jdaugherty/7.0.x

Fixing nexus publishing
grails · Dec 12, 2024 · 9e5ddd2 · 9e5ddd2
2 parents aa56597 + e722be9
commit 9e5ddd2
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy b/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy
@@ -129,6 +129,30 @@ The credentials and connection url must be specified as a project property or an
         if (nexusPublish) {
             rootProjectPluginManager.apply(NexusPublishPlugin)
             projectPluginManager.apply(SigningPlugin)
+
+            project.rootProject.tasks.withType(InitializeNexusStagingRepository).configureEach { InitializeNexusStagingRepository task ->
+                task.shouldRunAfter = project.tasks.withType(Sign)
+            }
+
+            project.tasks.withType(Sign) {
+                onlyIf { isRelease }
+            }
+
+            project.rootProject.nexusPublishing {
+                repositories {
+                    sonatype {
+                        if (nexusPublishUrl) {
+                            nexusUrl = project.uri(nexusPublishUrl)
+                        }
+                        if (nexusPublishSnapshotUrl) {
+                            snapshotRepositoryUrl = project.uri(nexusPublishSnapshotUrl)
+                        }
+                        username = nexusPublishUsername
+                        password = nexusPublishPassword
+                        stagingProfileId = nexusPublishStagingProfileId
+                    }
+                }
+            }
         }
 
         project.afterEvaluate {
@@ -272,36 +296,12 @@ The credentials and connection url must be specified as a project property or an
                         }
                     }
                 }
-            }
-
-            if (nexusPublish) {
-                extensionContainer.configure(SigningExtension, {
-                    it.required = isRelease
-                    it.sign project.publishing.publications.maven
-                })
-
-                project.rootProject.tasks.withType(InitializeNexusStagingRepository).configureEach { InitializeNexusStagingRepository task ->
-                    task.shouldRunAfter = project.tasks.withType(Sign)
-                }
-
-                project.tasks.withType(Sign) {
-                    onlyIf { isRelease }
-                }
 
-                project.rootProject.nexusPublishing {
-                    repositories {
-                        sonatype {
-                            if (nexusPublishUrl) {
-                                nexusUrl = project.uri(nexusPublishUrl)
-                            }
-                            if (nexusPublishSnapshotUrl) {
-                                snapshotRepositoryUrl = project.uri(nexusPublishSnapshotUrl)
-                            }
-                            username = nexusPublishUsername
-                            password = nexusPublishPassword
-                            stagingProfileId = nexusPublishStagingProfileId
-                        }
-                    }
+                if(nexusPublish && isRelease) {
+                    extensionContainer.configure(SigningExtension, {
+                        it.required = isRelease
+                        it.sign project.publishing.publications.maven
+                    })
                 }
             }