Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package groovy for openSUSE:Factory checked in at 2022-03-23 20:19:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/groovy (Old) and /work/SRC/openSUSE:Factory/.groovy.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "groovy" Wed Mar 23 20:19:23 2022 rev:8 rq:964344 version:2.4.21 Changes: -------- --- /work/SRC/openSUSE:Factory/groovy/groovy.changes 2022-03-21 20:13:14.596513151 +0100 +++ /work/SRC/openSUSE:Factory/.groovy.new.25692/groovy.changes 2022-03-23 20:21:14.818560135 +0100 @@ -1,0 +2,12 @@ +Wed Mar 23 17:05:03 UTC 2022 - Fridrich Strba <[email protected]> + +- Force building with JDK <= 15, since gradle does not work with + anything higher +- Modified patch: + * groovy-source-levels.patch + + build the whole with java source and target levels 8 +- Added patch: + * groovy-ambiguous-functions-calls.patch + + resolve parameter ambiguities with recent Java versions + +------------------------------------------------------------------- New: ---- groovy-ambiguous-functions-calls.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ groovy.spec ++++++ --- /var/tmp/diff_new_pack.z1oiee/_old 2022-03-23 20:21:15.466560501 +0100 +++ /var/tmp/diff_new_pack.z1oiee/_new 2022-03-23 20:21:15.470560504 +0100 @@ -40,6 +40,7 @@ Patch8: groovy-buildscan.patch Patch9: groovy-java11.patch Patch10: groovy-source-levels.patch +Patch11: groovy-ambiguous-functions-calls.patch BuildRequires: ant BuildRequires: ant-antlr BuildRequires: antlr @@ -73,6 +74,9 @@ BuildRequires: mvn(org.apache.ant:ant-junit) BuildRequires: mvn(org.apache.ant:ant-launcher) BuildRequires: mvn(org.codehaus.gpars:gpars) +BuildConflicts: java >= 16 +BuildConflicts: java-devel >= 16 +BuildConflicts: java-headless >= 16 Requires: %{name}-ant = %{version}-%{release} Requires: %{name}-bsf = %{version}-%{release} Requires: %{name}-console = %{version}-%{release} @@ -248,6 +252,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %{mvn_package} ':groovy::indy:' %{mvn_package} ':groovy-{*}' @1 ++++++ groovy-ambiguous-functions-calls.patch ++++++ --- groovy-2.4.21/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 2022-03-23 17:53:51.742427275 +0100 +++ groovy-2.4.21/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 2022-03-23 18:00:24.736785759 +0100 @@ -11061,7 +11061,7 @@ */ @SuppressWarnings("unchecked") public static <T> T[] plus(T[] left, T[] right) { - return (T[]) plus(toList(left), toList(right)).toArray(); + return (T[]) plus((Collection<T>)toList(left), (Collection<T>)toList(right)).toArray(); } /** @@ -11097,7 +11097,7 @@ */ @SuppressWarnings("unchecked") public static <T> T[] plus(T[] left, Collection<T> right) { - return (T[]) plus(toList(left), right).toArray(); + return (T[]) plus((Collection<T>)toList(left), right).toArray(); } /** @@ -11119,7 +11119,7 @@ */ @SuppressWarnings("unchecked") public static <T> T[] plus(T[] left, Iterable<T> right) { - return (T[]) plus(toList(left), toList(right)).toArray(); + return (T[]) plus((Collection<T>)toList(left), toList(right)).toArray(); } /** ++++++ groovy-source-levels.patch ++++++ --- /var/tmp/diff_new_pack.z1oiee/_old 2022-03-23 20:21:15.606560580 +0100 +++ /var/tmp/diff_new_pack.z1oiee/_new 2022-03-23 20:21:15.610560583 +0100 @@ -1,14 +1,82 @@ ---- groovy-2.4.16/build.gradle 2019-12-09 11:04:16.703039296 +0100 -+++ groovy-2.4.16/build.gradle 2019-12-09 11:06:08.723653849 +0100 -@@ -41,8 +41,8 @@ +--- groovy-2.4.21/build.gradle 2022-03-23 17:53:51.710427081 +0100 ++++ groovy-2.4.21/build.gradle 2022-03-23 17:54:24.646624760 +0100 +@@ -80,8 +80,8 @@ apply plugin: 'java' buildDir = 'target' - sourceCompatibility = 1.6 - targetCompatibility = 1.6 -+ sourceCompatibility = 1.7 -+ targetCompatibility = 1.7 ++ sourceCompatibility = 1.8 ++ targetCompatibility = 1.8 group = 'org.codehaus.groovy' version = groovyVersion +@@ -431,12 +431,12 @@ + tasks.withType(GroovyCompile) { + logger.info("Building ${project.name}:${name} with InvokeDynamic support activated") + groovyOptions.optimizationOptions.indy = true +- sourceCompatibility = 1.7 +- targetCompatibility = 1.7 ++ sourceCompatibility = 1.8 ++ targetCompatibility = 1.8 + } + tasks.withType(JavaCompile) { +- sourceCompatibility = 1.7 +- targetCompatibility = 1.7 ++ sourceCompatibility = 1.8 ++ targetCompatibility = 1.8 + } + jar { + classifier = 'indy' +@@ -459,7 +459,7 @@ + logger.lifecycle ''' + **************************************** WARNING ******************************************** + ****** You are running the build with an older JDK. NEVER try to release with 1.6. ****** +- ****** You must use a JDK 1.7+ in order to compile all features of the language. ****** ++ ****** You must use a JDK 1.8+ in order to compile all features of the language. ****** + ********************************************************************************************* + ''' + } +--- groovy-2.4.21/gradle/eclipse.gradle 2022-03-23 17:53:51.710427081 +0100 ++++ groovy-2.4.21/gradle/eclipse.gradle 2022-03-23 17:54:24.650624784 +0100 +@@ -22,8 +22,8 @@ + apply plugin: 'eclipse' + + eclipse.jdt { +- sourceCompatibility = 1.7 +- targetCompatibility = 1.7 ++ sourceCompatibility = 1.8 ++ targetCompatibility = 1.8 + } + + eclipse.classpath.file { +--- groovy-2.4.21/gradle/test.gradle 2022-03-23 17:53:51.710427081 +0100 ++++ groovy-2.4.21/gradle/test.gradle 2022-03-23 17:54:24.650624784 +0100 +@@ -115,8 +115,8 @@ + classpath = files(jar.archivePath) + source fileTree("$extModuleFixtureDir/src/main/java") + destinationDir = file("$extModuleOutputDir/classes") +- sourceCompatibility = 1.6 +- targetCompatibility = 1.6 ++ sourceCompatibility = 1.8 ++ targetCompatibility = 1.8 + } + + task testExtensionModuleJar(type:Jar) { +--- groovy-2.4.21/subprojects/groovy-nio/build.gradle 2022-03-23 17:53:51.814427708 +0100 ++++ groovy-2.4.21/subprojects/groovy-nio/build.gradle 2022-03-23 17:54:24.654624809 +0100 +@@ -31,10 +31,10 @@ + compileJava.dependsOn moduleDescriptor + + tasks.withType(JavaCompile) { +- sourceCompatibility = 1.7 +- targetCompatibility = 1.7 ++ sourceCompatibility = 1.8 ++ targetCompatibility = 1.8 + } + tasks.withType(Javadoc) { +- options.source = "1.7" ++ options.source = "1.8" + } +
