This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new e9624db0aa [skip ci] fix: setup cli distributions to just a lib
directory to match sdkman expectations
e9624db0aa is described below
commit e9624db0aad1605f056d805bbd5e0fdde76597d4
Author: James Daugherty <[email protected]>
AuthorDate: Mon Jul 7 23:44:17 2025 -0400
[skip ci] fix: setup cli distributions to just a lib directory to match
sdkman expectations
---
grails-forge/grails-cli/build.gradle | 33 +--------------------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/grails-forge/grails-cli/build.gradle
b/grails-forge/grails-cli/build.gradle
index 92eecaa114..064cedeb6e 100644
--- a/grails-forge/grails-cli/build.gradle
+++ b/grails-forge/grails-cli/build.gradle
@@ -89,17 +89,6 @@ cliStartScripts.configure { CreateStartScripts t ->
t.applicationName = 'grails'
t.mainClass = project.findProperty('startMainClass') as String
t.classpath = files(shadowJarTask)
-
- // See gradle tickets such as for lib
https://github.com/gradle/gradle/issues/7033
- doLast {
- t.unixScript.text = t.unixScript.text
- .replace('$APP_HOME/lib/',
"\$APP_HOME/.grails/$projectVersion/")
- .replace('"${APP_HOME:-./}.."', '"${APP_HOME:-./}"')
-
- t.windowsScript.text = t.windowsScript.text
- .replace('%APP_HOME%\\lib\\',
"%APP_HOME%\\.grails\\$projectVersion\\")
- .replace('%DIRNAME%..', '%DIRNAME%')
- }
}
TaskProvider<CreateStartScripts> shellCliStartScripts =
tasks.register('createShellCliStartScripts', CreateStartScripts)
@@ -109,17 +98,6 @@ shellCliStartScripts.configure { CreateStartScripts t ->
t.applicationName = 'grails-shell-cli'
t.mainClass = 'org.grails.cli.GrailsCli'
t.classpath = files(shadowJarTask)
-
- // See gradle tickets such as for lib
https://github.com/gradle/gradle/issues/7033
- doLast {
- t.unixScript.text = t.unixScript.text
- .replace('$APP_HOME/lib/',
"\$APP_HOME/.grails/${projectVersion}/")
- .replace('"${APP_HOME:-./}.."', '"${APP_HOME:-./}"')
-
- t.windowsScript.text = t.windowsScript.text
- .replace('%APP_HOME%\\lib\\',
"%APP_HOME%\\.grails\\${projectVersion}\\")
- .replace('%DIRNAME%..', '%DIRNAME%')
- }
}
TaskProvider<CreateStartScripts> forgeCliStartScripts =
tasks.register('createForgeCliStartScripts', CreateStartScripts)
@@ -129,15 +107,6 @@ forgeCliStartScripts.configure { CreateStartScripts t ->
t.applicationName = 'grails-forge-cli'
t.mainClass = 'org.grails.forge.cli.Application'
t.classpath = files(shadowJarTask)
-
- // See gradle tickets such as for lib
https://github.com/gradle/gradle/issues/7033
- doLast {
- t.unixScript.text = t.unixScript.text
- .replace('$APP_HOME/lib/',
"\$APP_HOME/.grails/$projectVersion/")
-
- t.windowsScript.text = t.windowsScript.text
- .replace('%APP_HOME%\\lib\\',
"%APP_HOME%\\.grails\\$projectVersion\\")
- }
}
project.extensions.getByType(DistributionContainer).configureEach {
@@ -145,7 +114,7 @@
project.extensions.getByType(DistributionContainer).configureEach {
it.distributionClassifier.set('incubating-bin')
it.contents {
from(shadowJarTask) {
- into "bin/.grails/$projectVersion"
+ into "lib"
}
from(cliStartScripts) {