Skip to content

Commit 2d1b2a0

Browse files
committed
Move to a strategy of targeting a grails version by branch version
1 parent fe1b4a2 commit 2d1b2a0

File tree

557 files changed

+54
-90620
lines changed

Some content is hidden

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

557 files changed

+54
-90620
lines changed

.github/workflows/gradle-publish.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
node-version: '20.5.1'
2828
- run: npm install
2929
- run: npm install --global gulp-cli
30-
- run: npm gulp grails5Release
30+
- run: npm gulp grailsRelease
3131
- name: Set up JDK 11
3232
uses: actions/setup-java@v3
3333
with:
@@ -39,10 +39,10 @@ jobs:
3939
uses: gradle/gradle-build-action@v2
4040
- name: Run build with Gradle Wrapper
4141
run: ./gradlew build
42-
working-directory: grails6/plugin
42+
working-directory: plugin
4343
- name: Publish to GitHub Packages
4444
run: ./gradlew publishMavenJarPublicationToGitHubPackagesRepository
45-
working-directory: grails6/plugin
45+
working-directory: plugin
4646
env:
4747
GITHUB_USERNAME: ${{ github.actor }}
4848
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
*.iml
44
build
55
node_modules
6-
.grunt
6+
.grunt
7+
.gradle
8+
build
9+
classes
10+
out

README.md

+16-128
File renamed without changes.

grails6/app/build.gradle renamed to app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
id "eclipse"
1111
}
1212

13-
group = "grails6.app"
13+
group = "grails.app"
1414

1515
repositories {
1616
mavenLocal()
@@ -71,7 +71,7 @@ dependencies {
7171
}
7272

7373
application {
74-
mainClass.set("grails6.app.Application")
74+
mainClass.set("grails.app.Application")
7575
}
7676

7777
java {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

grails6/app/grails-app/domain/grails6/app/Foo.groovy renamed to app/grails-app/domain/grails/app/Foo.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package grails6.app
1+
package grails.app
22

33
class Foo {
44

grails6/app/grails-app/init/grails6/app/Application.groovy renamed to app/grails-app/init/grails/app/Application.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package grails6.app
1+
package grails.app
22

33
import grails.boot.GrailsApp
44
import grails.boot.config.GrailsAutoConfiguration

grails5/app/grails-app/init/grails5/app/BootStrap.groovy renamed to app/grails-app/init/grails/app/BootStrap.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package grails5.app
1+
package grails.app
22

33
class BootStrap {
44

grails6/app/grails-cli.yml renamed to app/grails-cli.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
applicationType: web
2-
defaultPackage: grails6sample
2+
defaultPackage: grailssample
33
testFramework: spock
44
sourceLanguage: groovy
55
buildTool: gradle

build.sh

+2-39
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,10 @@
11
npm install
22

3-
# for Grails 3
3+
npx gulp grailsRelease
44

5-
npx gulp grails3Release
6-
7-
cd grails3/plugin
8-
./gradlew clean
9-
./gradlew jar
10-
11-
echo
12-
realpath build/libs/grails-console-*.jar
13-
14-
# for Grails 4
15-
16-
npx gulp grails4Release
17-
18-
cd grails4/plugin
19-
./gradlew clean
20-
./gradlew jar
21-
22-
echo
23-
realpath build/libs/grails-console-*.jar
24-
25-
26-
# for Grails 5
27-
28-
npx gulp grails5Release
29-
30-
cd grails5/plugin
5+
cd plugin
316
./gradlew clean
327
./gradlew jar
338

349
echo
3510
realpath build/libs/grails-console-*.jar
36-
37-
38-
# for Grails 6
39-
40-
npx gulp grails6Release
41-
42-
cd grails6/plugin
43-
./gradlew clean
44-
./gradlew jar
45-
46-
echo
47-
realpath build/libs/grails-console-*.jar
File renamed without changes.

grails6/gradlew renamed to gradlew

File renamed without changes.
File renamed without changes.

grails2/app/.gitignore

-13
This file was deleted.

grails2/app/application.properties

-5
This file was deleted.
Binary file not shown.
Binary file not shown.
-9.9 KB
Binary file not shown.

grails2/app/grails-app/assets/javascripts/application.js

-20
This file was deleted.

grails2/app/grails-app/assets/stylesheets/application.css

-13
This file was deleted.

0 commit comments

Comments
 (0)