Skip to content
This repository was archived by the owner on Mar 10, 2025. It is now read-only.

Commit 3064317

Browse files
Upgrade to Grails 6 (#129)
* bump to grails 6 * bump java version to 11 * Update common-build to 2.0.1 * Change source and target compatibility to Java 11 Add `sourceCompatibility = 1.11` and `targetCompatibility = 1.11`. * Only apply Java compatibility to plugin project --------- Co-authored-by: Emma Richardson <[email protected]>
1 parent 4dda36b commit 3064317

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/setup-java@v4
2020
with:
2121
distribution: 'adopt'
22-
java-version: '8'
22+
java-version: '11'
2323
- name: Run Build
2424
id: build
2525
uses: gradle/gradle-build-action@v2
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/setup-java@v4
4040
with:
4141
distribution: 'adopt'
42-
java-version: '8'
42+
java-version: '11'
4343
- name: Publish Artifacts (repo.grails.org)
4444
id: publish
4545
uses: gradle/gradle-build-action@v2

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
java: ['8']
10+
java: ['11']
1111
env:
1212
GIT_USER_NAME: puneetbehl
1313
GIT_USER_EMAIL: [email protected]

build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919
version project.projectVersion
2020

2121
ext {
22-
commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/master'
22+
commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/v2.0.1'
2323
}
2424

2525
subprojects {
@@ -69,6 +69,9 @@ subprojects {
6969
apply plugin: 'idea'
7070
apply plugin: 'java-library'
7171
apply plugin: "org.grails.grails-plugin"
72+
73+
sourceCompatibility = 1.11
74+
targetCompatibility = 1.11
7275
} else {
7376
apply from: "${commonBuild}/common-project.gradle"
7477
}
@@ -82,4 +85,4 @@ subprojects {
8285
}
8386
}
8487

85-
apply from: "${commonBuild}/common-publishing.gradle"
88+
apply from: "${commonBuild}/common-publishing.gradle"

examples/grails-multi-datastore-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ repositories {
55
dependencies {
66
implementation "org.springframework.boot:spring-boot-starter-logging"
77
implementation "org.springframework.boot:spring-boot-autoconfigure"
8-
implementation "org.grails:grails-core:5.3.2"
8+
implementation "org.grails:grails-core"
99
implementation "org.springframework.boot:spring-boot-starter-actuator"
1010
implementation "org.springframework.boot:spring-boot-starter-tomcat"
1111
implementation "org.grails:grails-plugin-url-mappings"

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ developers=James Kleeh
99
gormVersion=7.3.4
1010
gormHibernateVersion=7.3.1
1111
gormMongoDbVersion=7.0.0.RELEASE
12-
grailsVersion=5.3.3
13-
grailsGradlePluginVersion=5.3.0
12+
grailsVersion=6.1.0
13+
grailsGradlePluginVersion=6.1.0
1414
grailsDocsVersion=3.3.2
1515
groovyVersion=3.0.11
1616
junitJupiterVersion=5.9.3
@@ -25,7 +25,7 @@ viewsJsonVersion=2.3.2
2525
servletApiVersion=4.0.1
2626
cglibNodepVersion=3.2.9
2727
objenesisVersion=3.3
28-
jansiVersion=1.18
28+
jansiVersion=2.4.1
2929
hibernateEcacheVersion=5.6.7.Final
3030
hibernateCoreVersion=5.6.11.Final
3131
org.gradle.daemon=true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)