Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['11']
java: ['17']
env:
WORKSPACE: ${{ github.workspace }}
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
Expand All @@ -30,10 +30,10 @@ jobs:
with:
java-version: ${{ matrix.java }}
- name: Run Assemble
if: success() && github.event_name == 'push' && matrix.java == '11'
if: success() && github.event_name == 'push' && matrix.java == '17'
run: ./gradlew assemble
- name: Publish to repo.grails.org
if: success() && github.event_name == 'push' && matrix.java == '11'
if: success() && github.event_name == 'push' && matrix.java == '17'
env:
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
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: ['11']
java: ['17']
env:
GIT_USER_NAME: puneetbehl
GIT_USER_EMAIL: behlp@objectcomputing.com
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
Versions
---

| Grails | Wrapper |
|------------------------|---------------------------------------------------------------|
| 5.0.0 - 5.3.3 | [3.0.0.M1](https://github.com/grails/grails-wrapper/releases) |
| 5.3.4 - 5.3.X | [3.1.0](https://github.com/grails/grails-wrapper/releases) |
| 6.0.0+ | [4.0.0](https://github.com/grails/grails-wrapper/releases) |
| Grails | Wrapper |
|---------------|---------------------------------------------------------------|
| 5.0.0 - 5.3.3 | [3.0.0.M1](https://github.com/grails/grails-wrapper/releases) |
| 5.3.4 - 5.3.X | [3.1.0](https://github.com/grails/grails-wrapper/releases) |
| 6.x.x | [4.0.0](https://github.com/grails/grails-wrapper/releases) |
| 7.x.x | [5.0.0](https://github.com/grails/grails-wrapper/releases) |

20 changes: 20 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,23 @@ if (isReleaseVersion) {
}
}
}

allprojects {

apply plugin: "java"

java{
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if (details.requested.group == 'org.codehaus.groovy') {
details.useTarget(group: "org.apache.groovy", name: details.requested.name, version: groovyVersion)
details.because "The dependency coordinates are changed in Apache Groovy 4"
}
}
}
}
8 changes: 7 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
projectVersion=4.0.0-SNAPSHOT
projectVersion=5.0.0-SNAPSHOT
grailsVersion=7.0.0-SNAPSHOT
grailsGradlePluginVersion=7.0.0-SNAPSHOT
groovyVersion=4.0.22
springBootVersion=3.2.6
micronautInjectGroovyVersion=4.5.3
grailsShellVersion=7.0.0-SNAPSHOT
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading