Skip to content

Commit

Permalink
Upgrade to Grails 6 (#129)
Browse files Browse the repository at this point in the history
* 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 <49138186+Emrichardsone@users.noreply.github.com>
  • Loading branch information
puneetbehl and Emrichardsone committed Dec 17, 2023
1 parent 4dda36b commit 3064317
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '8'
java-version: '11'
- name: Run Build
id: build
uses: gradle/gradle-build-action@v2
Expand All @@ -39,7 +39,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '8'
java-version: '11'
- name: Publish Artifacts (repo.grails.org)
id: publish
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['8']
java: ['11']
env:
GIT_USER_NAME: puneetbehl
GIT_USER_EMAIL: behlp@objectcomputing.com
Expand Down
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
version project.projectVersion

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

subprojects {
Expand Down Expand Up @@ -69,6 +69,9 @@ subprojects {
apply plugin: 'idea'
apply plugin: 'java-library'
apply plugin: "org.grails.grails-plugin"

sourceCompatibility = 1.11
targetCompatibility = 1.11
} else {
apply from: "${commonBuild}/common-project.gradle"
}
Expand All @@ -82,4 +85,4 @@ subprojects {
}
}

apply from: "${commonBuild}/common-publishing.gradle"
apply from: "${commonBuild}/common-publishing.gradle"
2 changes: 1 addition & 1 deletion examples/grails-multi-datastore-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repositories {
dependencies {
implementation "org.springframework.boot:spring-boot-starter-logging"
implementation "org.springframework.boot:spring-boot-autoconfigure"
implementation "org.grails:grails-core:5.3.2"
implementation "org.grails:grails-core"
implementation "org.springframework.boot:spring-boot-starter-actuator"
implementation "org.springframework.boot:spring-boot-starter-tomcat"
implementation "org.grails:grails-plugin-url-mappings"
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ developers=James Kleeh
gormVersion=7.3.4
gormHibernateVersion=7.3.1
gormMongoDbVersion=7.0.0.RELEASE
grailsVersion=5.3.3
grailsGradlePluginVersion=5.3.0
grailsVersion=6.1.0
grailsGradlePluginVersion=6.1.0
grailsDocsVersion=3.3.2
groovyVersion=3.0.11
junitJupiterVersion=5.9.3
Expand All @@ -25,7 +25,7 @@ viewsJsonVersion=2.3.2
servletApiVersion=4.0.1
cglibNodepVersion=3.2.9
objenesisVersion=3.3
jansiVersion=1.18
jansiVersion=2.4.1
hibernateEcacheVersion=5.6.7.Final
hibernateCoreVersion=5.6.11.Final
org.gradle.daemon=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 3064317

Please sign in to comment.