Skip to content
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

compile grails-shell, grails-gradle-model and grails-bootstrap w/ Gradle Groovy version #13653

Merged
merged 29 commits into from
Sep 22, 2024
Merged

compile grails-shell, grails-gradle-model and grails-bootstrap w/ Gradle Groovy version #13653

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f6de935
compile grails-shell and grails-gradle-model with the Groovy version …
jamesfredley Sep 18, 2024
9c66b00
Update grails-boostrap
jamesfredley Sep 19, 2024
f77f071
Merge branch '7.0.x' into jamesfredley/fix-use-gradle-groovy-version
jamesfredley Sep 20, 2024
42dd604
Remove code that forces Groovy 4 now that dependencies have been updated
jamesfredley Sep 20, 2024
ba22622
cleanup
jamesfredley Sep 20, 2024
4663a52
cleanup
jamesfredley Sep 20, 2024
d869a0c
restore groovy 4 configuration
jamesfredley Sep 20, 2024
3ab8ea4
Adjust dependency scope
jamesfredley Sep 20, 2024
743b4b6
more version cleanup
jamesfredley Sep 20, 2024
36942dd
more cleanup
jamesfredley Sep 20, 2024
8b74731
cleanup
jamesfredley Sep 20, 2024
0073110
update github workflow
jamesfredley Sep 21, 2024
27af60b
update github workflow
jamesfredley Sep 21, 2024
0051fff
Remove code that forces Groovy 4 now that dependencies have been updated
jamesfredley Sep 21, 2024
0d11153
try --rerun-tasks
jamesfredley Sep 21, 2024
6cfc4cb
test with groovy 3 on test
jamesfredley Sep 21, 2024
d1c0949
force groovy 3 in grails-bootstrap
jamesfredley Sep 21, 2024
6462ea5
groovy 4.0.23
jamesfredley Sep 21, 2024
95493cd
experiment
jamesfredley Sep 21, 2024
c1fa6a9
followup experiment
jamesfredley Sep 21, 2024
5bda1fb
Revert "force groovy 3 in grails-bootstrap"
jamesfredley Sep 21, 2024
0a98a80
Update dependencies
jamesfredley Sep 21, 2024
94391ba
Revert "try --rerun-tasks"
jamesfredley Sep 21, 2024
18640d5
Revert "Remove code that forces Groovy 4 now that dependencies have b…
jamesfredley Sep 21, 2024
e088592
Revert "update github workflow"
jamesfredley Sep 21, 2024
26f22d7
Revert "update github workflow"
jamesfredley Sep 21, 2024
17cc395
PR feedback
jamesfredley Sep 21, 2024
6b62af5
fix groovydoc
jamesfredley Sep 21, 2024
a926e13
fix: get `groovydoc` task working again
matrei Sep 22, 2024
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
7 changes: 7 additions & 0 deletions grails-gradle-model/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dependencies {
// compile grails-gradle-model with the Groovy version provided by Gradle
// to ensure build compatibility with Gradle, currently Groovy 3.0.x
// when used by grails-gradle-plugin
// see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"
}
9 changes: 8 additions & 1 deletion grails-shell/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ ext {
}

dependencies {
// compile grails-shell with the Groovy version provided by Gradle
// to ensure build compatibility with Gradle, currently Groovy 3.0.x
// when used by grails-gradle-plugin
// see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"
compileOnly "org.codehaus.groovy:groovy-templates:$GroovySystem.version"

api project(":grails-bootstrap")
api project(":grails-gradle-model")
api "org.apache.ant:ant:$antVersion"
Expand All @@ -20,7 +27,7 @@ dependencies {
api "org.fusesource.jansi:jansi:$jansiVersion"
api "jline:jline:$jlineVersion"
api "org.gradle:gradle-tooling-api:$gradleToolingApiVersion"
compileOnly "org.apache.groovy:groovy-templates:$groovyVersion"

api "org.apache.groovy:groovy-xml:$groovyVersion"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about this one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I left this one as org.apache.groovy and 4.0.x since it was not for compilation and is needed by at least one project down the line that is running it with Groovy 4 (not grails-gradle-plugin)

We did the same on https://github.com/bertramdev/asset-pipeline/blob/5.0.x/asset-pipeline-core/build.gradle#L56-L74

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, but the one in asset-pipeline is testImplementation. This one is api. Doesn't api put it on the compileClasspath?


compileOnly "org.springframework.boot:spring-boot:$springBootVersion"
Expand Down
Loading