Skip to content

Commit 8550ecd

Browse files
jamesfredleyjamesfredley
authored
Merge pull request #14714 from apache/more-cli-updates2
Fix distribution for grails shell
2 parents 9d2260a + 457bf15 commit 8550ecd

File tree

69 files changed

+68
-344
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+68
-344
lines changed

‎.github/workflows/gradle.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: "🔨 Build project"
5454
working-directory: 'grails-gradle'
5555
run: >
56-
./gradlew build assemble
56+
./gradlew build
5757
--continue --stacktrace
5858
build:
5959
name: 'Build Grails-Core'
@@ -79,7 +79,7 @@ jobs:
7979
develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
8080
- name: "🔨 Build project"
8181
run: >
82-
./gradlew build assemble groovydoc
82+
./gradlew build :grails-shell-cli:installDist groovydoc
8383
--continue --stacktrace
8484
-PskipFunctionalTests
8585
-PskipMongodbTests

‎build.gradle

-17
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ ext {
3434
configuredTestParallel = findProperty('maxTestParallel') as Integer ?: (isCiBuild ? 3 : Runtime.runtime.availableProcessors() * 3 / 4 as int ?: 1)
3535
excludeUnusedTransDeps = findProperty('excludeUnusedTransDeps')
3636

37-
// Directories created during the build which are related
38-
// to turning the workspace root into a GRAILS_HOME
39-
distInstallDir = layout.buildDirectory.dir('dist-tmp')
40-
homeDistDir = layout.projectDirectory.dir('dist')
41-
homeBinDir = layout.projectDirectory.dir('bin')
42-
homeConfDir = layout.projectDirectory.dir('conf')
43-
homeLibDir = layout.projectDirectory.dir('lib')
44-
4537
testProjectsStartWith = [
4638
'grails-test-suite',
4739
'grails-test-examples'
@@ -93,16 +85,7 @@ subprojects {
9385
apply from: rootProject.layout.projectDirectory.file('gradle/dependency-licenses.gradle')
9486
}
9587

96-
tasks.register('clean', Delete).configure {
97-
group = 'build'
98-
99-
doFirst {
100-
delete(layout.buildDirectory, homeBinDir, homeConfDir, homeDistDir, homeLibDir)
101-
}
102-
}
103-
10488
apply {
105-
from layout.projectDirectory.file('gradle/assemble-root-config.gradle')
10689
from layout.projectDirectory.file('gradle/publish-root-config.gradle')
10790
from layout.projectDirectory.file('gradle/rat-root-config.gradle')
10891
}

‎gradle.properties

-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ gradleLicensePluginVersion=0.16.1
2424
gradleToolingApiVersion=8.12.1
2525
javaVersion=17
2626
joptSimpleVersion=5.0.4
27-
plexusComponentApiVersion=1.0-alpha-33
28-
plexusSecDispatcherVersion=1.4
29-
plexusSisuInjectVersion=2.6.0
3027
slf4jVersion=2.0.16
3128
gparsVersion=1.2.1
3229
commonsValidatorVersion=1.9.0

‎gradle/assemble-config.gradle

-42
This file was deleted.

‎gradle/assemble-root-config.gradle

-140
This file was deleted.

‎grails-async/core/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ dependencies {
4747
apply {
4848
// java-configuration must be applied first since tasks are now lazy registered
4949
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
50-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
5150
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
5251
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
5352
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-async/gpars/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ dependencies {
4747
apply {
4848
// java-configuration must be applied first since tasks are now lazy registered
4949
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
50-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
5150
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
5251
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
5352
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-async/plugin/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dependencies {
5757
apply {
5858
// java-configuration must be applied first since tasks are now lazy registered
5959
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
60-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
6160
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
6261
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
6362
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-async/rxjava/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ dependencies {
4343
apply {
4444
// java-configuration must be applied first since tasks are now lazy registered
4545
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
46-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
4746
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
4847
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
4948
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-async/rxjava2/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ dependencies {
4343
apply {
4444
// java-configuration must be applied first since tasks are now lazy registered
4545
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
46-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
4746
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
4847
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
4948
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-async/rxjava3/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ dependencies {
4343
apply {
4444
// java-configuration must be applied first since tasks are now lazy registered
4545
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
46-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
4746
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
4847
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
4948
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-bootstrap/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ processResources {
8383
apply {
8484
// java-configuration must be applied first since tasks are now lazy registered
8585
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
86-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
8786
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
8887
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
8988
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-cache/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ dependencies {
6060
apply {
6161
// java-configuration must be applied first since tasks are now lazy registered
6262
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
63-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
6463
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
6564
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
6665
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-codecs-core/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ dependencies {
5454
apply {
5555
// java-configuration must be applied first since tasks are now lazy registered
5656
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
57-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
5857
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
5958
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
6059
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-codecs/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ dependencies {
6464
apply {
6565
// java-configuration must be applied first since tasks are now lazy registered
6666
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
67-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
6867
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
6968
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
7069
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-common/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ dependencies {
5353
apply {
5454
// java-configuration must be applied first since tasks are now lazy registered
5555
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
56-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
5756
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
5857
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
5958
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-console/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ dependencies {
6767
apply {
6868
// java-configuration must be applied first since tasks are now lazy registered
6969
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
70-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
7170
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
7271
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
7372
}

‎grails-controllers/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ dependencies {
7474
apply {
7575
// java-configuration must be applied first since tasks are now lazy registered
7676
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
77-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
7877
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
7978
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
8079
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-converters/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ dependencies {
7373
apply {
7474
// java-configuration must be applied first since tasks are now lazy registered
7575
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
76-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
7776
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
7877
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
7978
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-core/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ tasks.named('processResources', ProcessResources).configure { ProcessResources i
9292
apply {
9393
// java-configuration must be applied first since tasks are now lazy registered
9494
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
95-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
9695
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
9796
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
9897
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-databinding-core/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dependencies {
5757
apply {
5858
// java-configuration must be applied first since tasks are now lazy registered
5959
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
60-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
6160
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
6261
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
6362
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-databinding/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ tasks.named('compileTestGroovy').configure {
7474
apply {
7575
// java-configuration must be applied first since tasks are now lazy registered
7676
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
77-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
7877
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
7978
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
8079
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

‎grails-datasource/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ dependencies {
7171
apply {
7272
// java-configuration must be applied first since tasks are now lazy registered
7373
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
74-
from rootProject.layout.projectDirectory.file('gradle/assemble-config.gradle')
7574
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
7675
from rootProject.layout.projectDirectory.file('gradle/publish-config.gradle')
7776
from rootProject.layout.projectDirectory.file('gradle/test-config.gradle')

0 commit comments

Comments
 (0)