Skip to content

Use groovy 4 for grails-gradle-tasks #14759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamesfredley merged 4 commits into from
May 20, 2025
Merged

Use groovy 4 for grails-gradle-tasks #14759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
171afcf
Use groovy 4 for grails-gradle-tasks
jamesfredley May 20, 2025
da2813a
Remove org.spockframework excludes and exclude org.apache.groovy on g…
jamesfredley May 20, 2025
0be9020
Add exclude group: 'org.spockframework' back
jamesfredley May 20, 2025
19195dc
remove groovy exclude from grails-gradle-tasks on grails-gradle-plugins
jamesfredley May 20, 2025
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
4 changes: 2 additions & 2 deletions grails-gradle/plugins/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ dependencies {

implementation project(':grails-gradle-tasks')

// spock is leaking from the grails-gradle-bom through grails-gradle-model
implementation project(':grails-gradle-model'), {
exclude group: 'org.apache.groovy'
exclude group: 'org.spockframework'
}

Expand Down Expand Up @@ -185,4 +185,4 @@ apply {
from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
from rootProject.layout.projectDirectory.file('gradle/e2eTest.gradle')
}
}
4 changes: 2 additions & 2 deletions grails-gradle/tasks/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ group = 'org.apache.grails'
dependencies {
implementation platform(project(':grails-gradle-bom'))

implementation "org.codehaus.groovy:groovy"
implementation "org.apache.groovy:groovy:${bomDependencyVersions['groovy.version']}"

// spock is leaking from the grails-gradle-bom through grails-gradle-model
implementation project(':grails-gradle-model'), {
exclude group: 'org.apache.groovy'
exclude group: 'org.spockframework'
}

Expand Down
Loading