Merge pull request #383 from jdaugherty/7.0.x

Fix profile publish plugin
grails · Dec 24, 2024 · 7cee872 · 7cee872
2 parents 5da451e + 077cb3e
commit 7cee872
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/groovy/org/grails/gradle/plugin/profiles/GrailsProfilePublishGradlePlugin.groovy b/src/main/groovy/org/grails/gradle/plugin/profiles/GrailsProfilePublishGradlePlugin.groovy
@@ -93,4 +93,9 @@ class GrailsProfilePublishGradlePlugin extends GrailsPublishGradlePlugin {
             }
         })
     }
+
+    @Override
+    protected validateProjectPublishable(Project project) {
+        // no-op
+    }
 }
diff --git a/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy b/src/main/groovy/org/grails/gradle/plugin/publishing/GrailsPublishGradlePlugin.groovy
@@ -217,10 +217,10 @@ Note: if project properties are used, the properties must be defined prior to ap
         }
 
         project.afterEvaluate {
-            validateProjectState(project)
+            validateProjectPublishable(project as Project)
             project.publishing {
                 if (useMavenPublish) {
-                    addMavenPublishValidations(project, mavenPublishUrl)
+                    addMavenPublishValidations(project as Project, mavenPublishUrl)
                     System.setProperty('org.gradle.internal.publish.checksums.insecure', true as String)
                     repositories {
                         maven {
@@ -383,7 +383,7 @@ Note: if project properties are used, the properties must be defined prior to ap
         }
     }
 
-    private void addMavenPublishValidations(Project project, def mavenPublishUrl) {
+    protected void addMavenPublishValidations(Project project, def mavenPublishUrl) {
         project.plugins.withId(MAVEN_PUBLISH_PLUGIN_ID) {
             TaskProvider<? extends Task> publishTask = project.tasks.named("publish")
 
@@ -416,7 +416,7 @@ Note: if project properties are used, the properties must be defined prior to ap
         'plugin'
     }
 
-    private validateProjectState(Project project) {
+    protected validateProjectPublishable(Project project) {
         if (!project.components) {
             throw new RuntimeException("Cannot apply Grails Publish Plugin. Project ${project.name} does not have any components to publish.")
         }