Skip to content

Commit 4866816

Browse files
vsachinvvsachinv
committed
Upgrade app to Grails 6.2 and also fix build.gradle for Grails 6.2
1 parent 088dc2e commit 4866816

File tree

135 files changed

+45151
-3
lines changed

Some content is hidden

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

135 files changed

+45151
-3
lines changed

‎README.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,41 @@ dependencies {
122122
123123
```
124124

125+
126+
### Grails 6+
127+
128+
Add a dependency in build.gradle
129+
130+
```groovy
131+
repositories {
132+
maven { url "https://jitpack.io" }
133+
}
134+
135+
dependencies {
136+
compile 'com.github.vsachinv:grails-console:6.0-M1'
137+
}
138+
```
139+
140+
In addition if you don't want to use jitpack.io then use following github package registry:
141+
142+
```groovy
143+
repositories {
144+
maven {
145+
name = "GitHubPackages"
146+
url = uri("https://maven.pkg.github.com/vsachinv/grails-console")
147+
credentials {
148+
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USERNAME")
149+
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
150+
}
151+
}
152+
}
153+
154+
dependencies {
155+
compile 'org.grails.plugins:grails-console:6.0-M1'
156+
}
157+
158+
```
159+
125160
## Usage
126161

127162
Use a browser to navigate to the /console page of your running app, e.g. http://localhost:8080/{app-name}/console

‎build.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,17 @@ cd grails5/plugin
3131
./gradlew clean
3232
./gradlew jar
3333

34+
echo
35+
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+
3446
echo
3547
realpath build/libs/grails-console-*.jar

‎changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
### v6.0-M1
2+
* Upgrade to Grails 6.2
3+
4+
### v5.0-M1
5+
* Upgrade to Grails 5.3.6
6+
7+
### v4.0-M1
8+
* Upgrade for Grails 4.1.4
9+
110
### v2.2.0
211
* Fix for Console hijacking `System.out` and breaking system logs
312
* Fix for `NullPointerException` when running empty script on server with `grails.databinding.convertEmptyStringsToNull` set to default value `true`

‎grails6/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.gradle
2+
build
3+
classes
4+
5+
out

‎grails6/app/.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
target
2+
build
3+
*.log
4+
*.zip
5+
plugin.xml
6+
.settings/
7+
web-app/WEB-INF/tld
8+
.idea
9+
/node_modules/
10+
/.grunt/
11+
/grails-app/views/console/_*
12+
.DS_Store
13+
.classpath
14+
.project
15+
.gradle

‎grails6/app/build.gradle

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
plugins {
2+
id "groovy"
3+
id "org.grails.grails-web"
4+
id "org.grails.grails-gsp"
5+
id "com.github.erdi.webdriver-binaries"
6+
id "war"
7+
id "idea"
8+
id "com.bertramlabs.asset-pipeline"
9+
id "application"
10+
id "eclipse"
11+
}
12+
13+
group = "grails6.app"
14+
15+
repositories {
16+
mavenLocal()
17+
mavenCentral()
18+
maven { url "https://repo.grails.org/grails/core/" }
19+
}
20+
21+
configurations {
22+
all {
23+
resolutionStrategy.eachDependency { DependencyResolveDetails details->
24+
if (details.requested.group == 'org.seleniumhq.selenium') {
25+
details.useVersion('4.19.1')
26+
}
27+
}
28+
}
29+
}
30+
31+
dependencies {
32+
implementation("org.grails:grails-core")
33+
implementation("org.grails:grails-logging")
34+
implementation("org.grails:grails-plugin-databinding")
35+
implementation("org.grails:grails-plugin-i18n")
36+
implementation("org.grails:grails-plugin-interceptors")
37+
implementation("org.grails:grails-plugin-rest")
38+
implementation("org.grails:grails-plugin-services")
39+
implementation("org.grails:grails-plugin-url-mappings")
40+
implementation("org.grails:grails-web-boot")
41+
implementation("org.grails.plugins:gsp")
42+
implementation("org.grails.plugins:hibernate5")
43+
implementation("org.grails.plugins:scaffolding")
44+
implementation("org.springframework.boot:spring-boot-autoconfigure")
45+
implementation("org.springframework.boot:spring-boot-starter")
46+
implementation("org.springframework.boot:spring-boot-starter-actuator")
47+
implementation("org.springframework.boot:spring-boot-starter-logging")
48+
implementation("org.springframework.boot:spring-boot-starter-tomcat")
49+
implementation("org.springframework.boot:spring-boot-starter-validation")
50+
compileOnly("io.micronaut:micronaut-inject-groovy")
51+
console("org.grails:grails-console")
52+
runtimeOnly("com.bertramlabs.plugins:asset-pipeline-grails:4.3.0")
53+
runtimeOnly("com.h2database:h2")
54+
runtimeOnly("org.apache.tomcat:tomcat-jdbc")
55+
runtimeOnly("org.fusesource.jansi:jansi:1.18")
56+
testImplementation("io.micronaut:micronaut-inject-groovy")
57+
testImplementation("org.grails:grails-gorm-testing-support")
58+
testImplementation("org.grails:grails-web-testing-support")
59+
testImplementation("org.grails.plugins:geb")
60+
testImplementation("org.seleniumhq.selenium:selenium-api:4.19.1")
61+
testImplementation("org.seleniumhq.selenium:selenium-remote-driver:4.19.1")
62+
testImplementation("org.seleniumhq.selenium:selenium-support:4.19.1")
63+
testImplementation("org.spockframework:spock-core")
64+
testRuntimeOnly("org.seleniumhq.selenium:selenium-chrome-driver:4.19.1")
65+
testRuntimeOnly("org.seleniumhq.selenium:selenium-firefox-driver:4.19.1")
66+
testRuntimeOnly("org.seleniumhq.selenium:selenium-safari-driver:4.19.1")
67+
testImplementation("io.micronaut:micronaut-http-client")
68+
69+
implementation project(':plugin')
70+
71+
}
72+
73+
application {
74+
mainClass.set("grails6.app.Application")
75+
}
76+
77+
java {
78+
sourceCompatibility = JavaVersion.toVersion("11")
79+
}
80+
81+
tasks.withType(Test) {
82+
useJUnitPlatform()
83+
systemProperty "geb.env", System.getProperty('geb.env')
84+
systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
85+
systemProperty 'webdriver.chrome.driver', "${System.getenv('CHROMEWEBDRIVER')}/chromedriver"
86+
systemProperty 'webdriver.gecko.driver', "${System.getenv('GECKOWEBDRIVER')}/geckodriver"
87+
}
88+
webdriverBinaries {
89+
chromedriver '122.0.6260.0'
90+
geckodriver '0.33.0'
91+
edgedriver '110.0.1587.57'
92+
}
93+
assets {
94+
minifyJs = true
95+
minifyCss = true
96+
}

‎grails6/app/buildSrc/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
repositories {
2+
mavenCentral()
3+
maven { url "https://repo.grails.org/grails/core/" }
4+
}
5+
dependencies {
6+
implementation("com.bertramlabs.plugins:asset-pipeline-gradle:4.3.0")
7+
implementation("org.grails:grails-gradle-plugin:6.1.2")
8+
implementation("org.grails.plugins:hibernate5:8.1.0")
9+
}

‎grails6/app/gradle.properties

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
grailsVersion=6.2.0
2+
grailsGradlePluginVersion=6.1.2
3+
version=6.0
4+
org.gradle.caching=true
5+
org.gradle.daemon=true
6+
org.gradle.parallel=true
7+
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M

‎grails6/app/gradle/wrapper/gradle-wrapper.jar

58.1 KB
Binary file not shown.

‎grails6/app/gradle/wrapper/gradle-wrapper.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)