[Git][java-team/groovy][master] Fixed the compatibility with Gradle 5

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / groovy


Commits:
9f77fc89 by Emmanuel Bourg at 2026-11-05T11:55:35+01:00
Fixed the compatibility with Gradle 5

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/23_gradle_compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+groovy (2.4.21-14) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with Gradle 5
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 05 Nov 2026 11:55:27 +0100
+
 groovy (2.4.21-13) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/23_gradle_compatibility.patch
=====================================
@@ -0,0 +1,42 @@
+Description: Fix the compatibility with Gradle 5
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -297,7 +297,7 @@
+             include 'groovy/inspect/swingui/AstBrowserProperties.groovy',
+                     'org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java'
+         }
+-        into sourceSets.main.output.classesDir
++        into sourceSets.main.java.outputDir
+     }
+ }
+ 
+@@ -336,7 +336,7 @@
+ 
+ task dgmConverter(dependsOn:compileJava) {
+     description = 'Generates DGM info file required for faster startup.'
+-    def classesDir = sourceSets.main.output.classesDir
++    def classesDir = sourceSets.main.java.outputDir
+     def classpath = files(classesDir, configurations.compile).asPath
+ 
+     //main = 'org.codehaus.groovy.tools.DgmConverter'
+@@ -377,7 +377,7 @@
+         destinationDir.mkdirs()
+         ant.jar(
+                 destfile: archivePath,
+-                basedir: file(sourceSets.main.output.classesDir)
++                basedir: file(sourceSets.main.java.outputDir)
+         )
+     }
+     inputs.property('indy', useIndy())
+--- a/subprojects/groovy-groovydoc/build.gradle
++++ b/subprojects/groovy-groovydoc/build.gradle
+@@ -27,6 +27,6 @@
+ 
+ compileJava {
+     doLast {
+-        mkdir "$sourceSets.main.output.classesDir/META-INF"
++        mkdir "$sourceSets.main.java.outputDir/META-INF"
+     }
+ }


=====================================
debian/patches/series
=====================================
@@ -23,3 +23,4 @@ update-to-JLine2-2.13.patch
 20_reproducible_traits.patch
 21_reproducible_reflection.patch
 22_reproducible_groovydoc_inherited.patch
+23_gradle_compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/groovy/-/commit/9f77fc8967e87129a9c6513ffcf07ae96467a2be

-- 
View it on GitLab: https://salsa.debian.org/java-team/groovy/-/commit/9f77fc8967e87129a9c6513ffcf07ae96467a2be
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20261105/33ad4615/attachment.htm>