(grails-forge) 03/04: Create a combined distribution in grails-cli

[jdaugherty]

This is an automated email from the ASF dual-hosted git repository.

jdaugherty pushed a commit to branch wrapper-rewrite
in repository https://gitbox.apache.org/repos/asf/grails-forge.git

commit bb1b8b3f433d5f31a5ba4da0f2e61ef189a5220f
Author: James Daugherty <jdaughe...@jdresources.net>
AuthorDate: Wed May 14 11:29:30 2025 -0400

    Create a combined distribution in grails-cli
---
 .../internal/tasks/PicocliBuildCompletionTask.java    |  2 +-
 grails-cli/build.gradle                               | 19 ++++++++++++++-----
 grails-forge-cli/build.gradle                         |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git 
a/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java
 
b/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java
index 4105883..99bbf3b 100644
--- 
a/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java
+++ 
b/buildSrc/src/main/groovy/org/grails/forge/internal/tasks/PicocliBuildCompletionTask.java
@@ -50,7 +50,7 @@ public abstract class PicocliBuildCompletionTask extends 
DefaultTask {
             spec.jvmArgs("-Dpicocli.autocomplete.systemExitOnError");
             spec.args(
                     getMainClass().get(),
-                    "--completionScript=" + 
getOutputDirectory().file("grails_completion").get().getAsFile().getAbsolutePath(),
+                    "--completionScript=" + 
getOutputDirectory().file("grails_forge_cli_completion").get().getAsFile().getAbsolutePath(),
                     "--force",
                     "--factory=org.grails.forge.cli.GrailsPicocliFactory"
             );
diff --git a/grails-cli/build.gradle b/grails-cli/build.gradle
index 8c11006..b92d0e7 100644
--- a/grails-cli/build.gradle
+++ b/grails-cli/build.gradle
@@ -158,21 +158,30 @@ 
project.extensions.getByType(DistributionContainer).configureEach {
             fileMode = 0755
         }
 
+        
from(rootProject.project(':grails-forge-cli').layout.buildDirectory.file('exploded/bin/grails_forge_cli_completion'))
 {
+            into ''
+            fileMode = 0755
+        }
+
         from(rootProject.layout.projectDirectory.file('LICENSE')) { it.into '' 
}
         from(rootProject.layout.projectDirectory.file('NOTICE')) { it.into '' }
         from(rootProject.layout.projectDirectory.file('INSTALL')) { it.into '' 
}
     }
 }
 
+def distZipTask = tasks.named('distZip')
+distZipTask.configure {
+    dependsOn cliStartScripts, forgeCliStartScripts, shellCliStartScripts, 
jarTask, shadowJarTask, 
rootProject.project(':grails-forge-cli').tasks.named('exploded')
+}
+tasks.named('build').configure {
+    it.dependsOn(distZipTask)
+}
 tasks.named('assemble').configure {
-    it.dependsOn cliStartScripts, forgeCliStartScripts, shellCliStartScripts
+    it.dependsOn cliStartScripts, forgeCliStartScripts, shellCliStartScripts, 
rootProject.project(':grails-forge-cli').tasks.named('exploded')
 }
 tasks.named('installDist').configure {
     it.dependsOn cliStartScripts, forgeCliStartScripts, shellCliStartScripts
 }
-tasks.named('distZip').configure {
-    dependsOn cliStartScripts, forgeCliStartScripts, shellCliStartScripts, 
jarTask, shadowJarTask
-}
 tasks.named('distTar').configure {
-    dependsOn cliStartScripts, forgeCliStartScripts, shellCliStartScripts, 
jarTask, shadowJarTask
+    dependsOn cliStartScripts, forgeCliStartScripts, shellCliStartScripts, 
jarTask, shadowJarTask, 
rootProject.project(':grails-forge-cli').tasks.named('exploded')
 }
diff --git a/grails-forge-cli/build.gradle b/grails-forge-cli/build.gradle
index 40b09d6..ca51aad 100644
--- a/grails-forge-cli/build.gradle
+++ b/grails-forge-cli/build.gradle
@@ -100,7 +100,7 @@ rocker {
 }
 
 startScripts {
-    applicationName = 'grails'
+    applicationName = 'grails-forge-cli'
 }
 
 sdkman {