You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/03/21 15:50:19 UTC

[groovy] branch groovy3-java16 updated (96ad7e9 -> aa15919)

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a change to branch groovy3-java16
in repository https://gitbox.apache.org/repos/asf/groovy.git.


    omit 96ad7e9  Gradle 7.2 for Java 16+
     add dcc329f  GROOVY-10519: v9 ClassFinder closes existing FileSystems that it doesn't own
     add df335be  Bump version on GROOVY_3_0_X branch
     add eb30684  GROOVY-10522: stubgen: no isser for Boolean property if one was declared
     add d04f793  fix groovydoc typo - thanks to @chagmed (Dan DeRobertis) on twitter
     add fab6552  fix groovydoc typo - thanks to @chagmed (Dan DeRobertis) on twitter
     add de529bb  Groovy-10520: Capture correct line numbers for Closure/Block statements.
     add 228056d  GROOVY-10495: Invalid newlines generated by XmlTemplateEngine (port to 3_0_X)
     add 1e7fcf4  Revert "Groovy-10520: Capture correct line numbers for Closure/Block statements."
     add 19a6464  GROOVY-10520: Incorrect line numbers for Closure classes in AstNode
     add 9a7b54c  GROOVY-10525: add test case
     add f9dc615  GROOVY-10280: STC: do not mix type param contexts when resolving
     add 911963a  GROOVY-6919: STC: check bound types for fields, methods, properties, ...
     add 955de75  rework broken performance subproject which hasn't been used much for a long time (port to 3_0_X)
     add ff3ef86  GROOVY-10482: STC: resolve type parameter of `<T> T m()` in call args
     add 62e5469  GROOVY-10499: add test case
     add 609b3e1  GROOVY-5523, GROOVY-9972, GROOVY-9983, GROOVY-10357: STC: ternary checks
     add b2d9467  GROOVY-10532: Bump Codenarc to 3.0.0 (build dependency)
     add 1361caa  update gradle conventions
     add 479c5c8  update gradle conventions for JarJarTask
     add 44ca020  update gradle conventions for ReleaseInfoGenerator task
     add 2136d9e  update gradle conventions for WriteExtensionDescriptorTask
     add bc702c4  minor refactor
     add 7d0a99c  Merge some refactoring parts of GROOVY-10439 to ease future maintenance across versions
     add 6b8c3ad  GROOVY-7288: fix for `@Delegate` target that implements trait(s) (port to 3_0_X)
     add fe84dd7  GROOVY-8243: support closure for functional interface that extends trait
     add f2991ba  minor edits
     new aa15919  Gradle 7.2 for Java 16+

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (96ad7e9)
            \
             N -- N -- N   refs/heads/groovy3-java16 (aa15919)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle                                       |   9 +-
 .../org/codehaus/groovy/gradle/JarJarTask.groovy   |  14 +-
 .../groovy/gradle/ReleaseInfoGenerator.groovy      |   2 +-
 .../gradle/WriteExtensionDescriptorTask.groovy     |  13 +-
 gradle.properties                                  |  96 ++---
 gradle/quality.gradle                              |   9 +-
 src/main/java/groovy/transform/NamedVariant.java   |   4 +-
 .../java/org/codehaus/groovy/ast/GenericsType.java |   9 +-
 .../codehaus/groovy/ast/tools/GeneralUtils.java    |  26 +-
 .../codehaus/groovy/ast/tools/GenericsUtils.java   |   7 +-
 .../org/codehaus/groovy/classgen/Verifier.java     |  18 +-
 .../groovy/runtime/DefaultGroovyMethods.java       |  41 +--
 .../groovy/runtime/ProxyGeneratorAdapter.java      |  53 ++-
 .../transform/DelegateASTTransformation.java       |  33 +-
 .../transform/stc/StaticTypeCheckingSupport.java   |  14 +-
 .../transform/stc/StaticTypeCheckingVisitor.java   | 367 +++++++++----------
 .../codehaus/groovy/vmplugin/v9/ClassFinder.java   |  26 +-
 .../bugs/{Groovy9790.groovy => Groovy7753.groovy}  |  74 ++--
 src/test/groovy/bugs/Groovy7753Bug.groovy          |  94 -----
 .../stc/ClosureParamTypeInferenceSTCTest.groovy    |  59 ++-
 .../groovy/transform/stc/ClosuresSTCTest.groovy    |  32 ++
 .../groovy/transform/stc/GenericsSTCTest.groovy    | 401 ++++++++++++++++++---
 .../transform/stc/TernaryOperatorSTCTest.groovy    | 174 ++++++---
 .../org/codehaus/groovy/ast/LineColumnCheck.txt    |   7 +
 .../{Groovy10299.groovy => Groovy10522.groovy}     |  23 +-
 .../traitx/TraitASTTransformationTest.groovy       |  52 ++-
 subprojects/groovy-json/build.gradle               |   2 +-
 subprojects/groovy-servlet/build.gradle            |   6 +-
 .../main/groovy/groovy/text/XmlTemplateEngine.java |  47 ++-
 .../groovy/text/GroovyXmlTemplateEngineTest.groovy |  74 ++++
 subprojects/groovy-test-junit5/build.gradle        |   2 +-
 subprojects/groovy-test/build.gradle               |  12 +-
 subprojects/groovy-testng/build.gradle             |   6 +-
 .../src/main/java/groovy/xml/XmlNodePrinter.java   |   2 +-
 subprojects/groovy-yaml/build.gradle               |   2 +-
 .../apache/groovy/parser/antlr4/AstBuilder.java    |   6 +-
 subprojects/performance/build.gradle               |  42 ++-
 37 files changed, 1176 insertions(+), 682 deletions(-)
 copy src/test/groovy/bugs/{Groovy9790.groovy => Groovy7753.groovy} (52%)
 delete mode 100644 src/test/groovy/bugs/Groovy7753Bug.groovy
 copy src/test/org/codehaus/groovy/tools/stubgenerator/{Groovy10299.groovy => Groovy10522.groovy} (78%)
 create mode 100644 subprojects/groovy-templates/src/test/groovy/groovy/text/GroovyXmlTemplateEngineTest.groovy

[groovy] 01/01: Gradle 7.2 for Java 16+

Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch groovy3-java16
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit aa159192e3c88849bbd4d649392a1bb5aaf266bb
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Mar 3 15:54:58 2022 -0600

    Gradle 7.2 for Java 16+
---
 build.gradle                                         |  3 +--
 .../org/codehaus/groovy/gradle/JarJarTask.groovy     | 16 ++++++----------
 .../groovy/gradle/ReleaseInfoGenerator.groovy        |  4 ++--
 .../gradle/WriteExtensionDescriptorTask.groovy       | 11 +++++++----
 gradle.properties                                    |  2 +-
 gradle/assemble.gradle                               |  2 ++
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 .../codehaus/groovy/reflection/ReflectionUtils.java  | 20 ++++++++++++++------
 .../groovy/runtime/ProxyGeneratorAdapter.java        | 18 +++++++++++-------
 subprojects/groovy-servlet/build.gradle              |  9 +++------
 10 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/build.gradle b/build.gradle
index 08cc3cb..c676f1c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,6 @@ buildscript {
         // using the old "classpath" style of plugins because the new one doesn't play well with multi-modules
         classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.8'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.3'
-        //classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
         classpath 'org.nosphere.apache:creadur-rat-gradle:0.7.0'
         classpath 'gradle.plugin.com.github.jk1:gradle-license-report:1.3'
     }
@@ -432,7 +431,7 @@ apply from: 'gradle/test.gradle'
 apply from: 'gradle/groovydoc.gradle'
 apply from: 'gradle/docs.gradle'
 apply from: 'gradle/assemble.gradle'
-apply from: 'gradle/upload.gradle'
+//apply from: 'gradle/upload.gradle' -- TODO: migrate to Gradle 7
 apply from: 'gradle/idea.gradle'
 apply from: 'gradle/eclipse.gradle'
 apply from: 'gradle/quality.gradle'
diff --git a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy
index 0fdf771..454eb73 100644
--- a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy
+++ b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy
@@ -28,6 +28,7 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 
@@ -53,23 +54,19 @@ class JarJarTask extends DefaultTask {
     @org.gradle.api.tasks.Optional
     List<String> untouchedFiles = []
 
-    @Input
-    @org.gradle.api.tasks.Optional
+    @Optional @Input
     List<String> excludes = []
 
     @Input
     Map<String, String> patterns
 
-    @Input
-    @org.gradle.api.tasks.Optional
+    @Optional @Input
     Map<String, List<String>> excludesPerLibrary = [:]
 
-    @Input
-    @org.gradle.api.tasks.Optional
+    @Optional @Input
     Map<String, List<String>> includesPerLibrary = [:]
 
-    @Input
-    @org.gradle.api.tasks.Optional
+    @Optional @Input
     Map<String, String> includedResources = [:]
 
     @OutputFile
@@ -169,5 +166,4 @@ class JarJarTask extends DefaultTask {
     private static String baseName(File file) {
         file.name.substring(0, file.name.lastIndexOf('-'))
     }
-
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/ReleaseInfoGenerator.groovy b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/ReleaseInfoGenerator.groovy
index 7e915f8..b83e027 100644
--- a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/ReleaseInfoGenerator.groovy
+++ b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/ReleaseInfoGenerator.groovy
@@ -20,10 +20,10 @@ package org.codehaus.groovy.gradle
 
 import groovy.transform.CompileStatic
 import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
 
 import java.text.SimpleDateFormat
 
diff --git a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
index dd582dc..746235e 100644
--- a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
+++ b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
@@ -22,6 +22,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
 
 /**
@@ -30,10 +31,12 @@ import org.gradle.api.tasks.OutputFile
 class WriteExtensionDescriptorTask extends DefaultTask {
     @Internal
     final String description = 'Generates the org.codehaus.groovy.runtime.ExtensionModule descriptor file of a module'
-    @Input String extensionClasses = ''
-    @Input String staticExtensionClasses = ''
-    @OutputFile File descriptor = computeDescriptorFile()
-
+    @OutputFile
+    File descriptor = computeDescriptorFile()
+    @Input
+    String staticExtensionClasses = ''
+    @Input
+    String extensionClasses = ''
 
     private File computeDescriptorFile() {
         def metaInfDir = new File("${project.buildDir}/resources/main/META-INF/groovy")
diff --git a/gradle.properties b/gradle.properties
index 71c844d..7459139 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ groovyVersion = 3.0.11-SNAPSHOT
 groovyBundleVersion = 3.0.11.SNAPSHOT
 
 binaryCompatibilityBaseline = 3.0.5
-gradle_version=6.9.2
+gradle_version=7.2
 
 groovyJUnit_ms=512m
 groovyJUnit_mx=2g
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 9cb26cf..a074dec 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -165,6 +165,7 @@ allprojects {
 
     def producedJars = [jar]
     jar {
+        duplicatesStrategy = DuplicatesStrategy.WARN
         appendix = 'raw'
         manifest {
             from(allManifest) {
@@ -179,6 +180,7 @@ allprojects {
     if (rootProject.indyCapable()) {
         task jarWithIndy(type: Jar) {
             dependsOn compileGroovyWithIndy
+            duplicatesStrategy = DuplicatesStrategy.WARN
             classifier = 'indy'
             appendix = 'raw'
             from sourceSets.main.java.outputDir
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ec991f9..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java b/src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java
index 411b79d..83c7b55 100644
--- a/src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java
+++ b/src/main/java/org/codehaus/groovy/reflection/ReflectionUtils.java
@@ -133,6 +133,14 @@ public class ReflectionUtils {
         }
     }
 
+    private static boolean classShouldBeIgnored(final Class c, final Collection<String> extraIgnoredPackages) {
+        return (c != null
+                && (c.isSynthetic()
+                    || (c.getPackage() != null
+                        && (IGNORED_PACKAGES.contains(c.getPackage().getName())
+                          || extraIgnoredPackages.contains(c.getPackage().getName())))));
+    }
+
     public static List<Method> getDeclaredMethods(final Class<?> type, final String name, final Class<?>... parameterTypes) {
         return doGetMethods(type, name, parameterTypes, Class::getDeclaredMethods);
     }
@@ -225,12 +233,12 @@ public class ReflectionUtils {
         }
     }
 
-    private static boolean classShouldBeIgnored(final Class c, final Collection<String> extraIgnoredPackages) {
-        return (c != null
-                && (c.isSynthetic()
-                    || (c.getPackage() != null
-                        && (IGNORED_PACKAGES.contains(c.getPackage().getName())
-                          || extraIgnoredPackages.contains(c.getPackage().getName())))));
+    public static boolean isSealed(Class<?> c) {
+        try {
+            return Boolean.TRUE.equals(Class.class.getMethod("isSealed").invoke(c));
+        } catch (ReflectiveOperationException | SecurityException ignore) {
+        }
+        return false;
     }
 
     private static class ClassContextHelper extends SecurityManager {
diff --git a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
index 6869e83..ecc0346 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
@@ -59,6 +59,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.codehaus.groovy.reflection.ReflectionUtils.isSealed;
+
 /**
  * A proxy generator responsible for mapping a map of closures to a class implementing a list of interfaces. For
  * example, the following code:
@@ -143,7 +145,7 @@ public class ProxyGeneratorAdapter extends ClassVisitor implements Opcodes {
             final ClassLoader proxyLoader,
             final boolean emptyBody,
             final Class delegateClass) {
-        super(CompilerConfiguration.ASM_API_VERSION, new ClassWriter(0));
+        super(CompilerConfiguration.ASM_API_VERSION, new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
         this.loader = proxyLoader != null ? createInnerLoader(proxyLoader, interfaces) : findClassLoader(superClass, interfaces);
         this.visitedMethods = new LinkedHashSet<Object>();
         this.delegatedClosures = closureMap.isEmpty() ? EMPTY_DELEGATECLOSURE_MAP : new HashMap<String, Boolean>();
@@ -170,11 +172,13 @@ public class ProxyGeneratorAdapter extends ClassVisitor implements Opcodes {
         this.superClass = fixedSuperClass;
 
         // create the base list of classes which have possible methods to be overloaded
-        this.classList = new LinkedHashSet<Class>();
+        this.classList = new LinkedHashSet<>();
         this.classList.add(superClass);
         if (generateDelegateField) {
-            classList.add(delegateClass);
-            Collections.addAll(this.classList, delegateClass.getInterfaces());
+            this.classList.add(delegateClass);
+            for (Class i : delegateClass.getInterfaces()) {
+                if (!isSealed(i)) this.classList.add(i);
+            }
         }
         if (interfaces != null) {
             Collections.addAll(this.classList, interfaces);
@@ -183,9 +187,9 @@ public class ProxyGeneratorAdapter extends ClassVisitor implements Opcodes {
         this.emptyBody = emptyBody;
 
         // generate bytecode
-        ClassWriter writer = (ClassWriter) cv;
-        this.visit(Opcodes.V1_5, ACC_PUBLIC, proxyName, null, null, null);
-        byte[] b = writer.toByteArray();
+        int bytecodeVersion = CompilerConfiguration.JDK_TO_BYTECODE_VERSION_MAP.get(CompilerConfiguration.DEFAULT.getTargetBytecode());
+        this.visit(bytecodeVersion, ACC_PUBLIC, proxyName, null, null, null);
+        byte[] b = ((ClassWriter) cv).toByteArray();
 //        CheckClassAdapter.verify(new ClassReader(b), true, new PrintWriter(System.err));
         cachedClass = loader.defineClass(proxyName.replace('/', '.'), b);
         // cache no-arg constructor
diff --git a/subprojects/groovy-servlet/build.gradle b/subprojects/groovy-servlet/build.gradle
index 224693f..0b3a524 100644
--- a/subprojects/groovy-servlet/build.gradle
+++ b/subprojects/groovy-servlet/build.gradle
@@ -17,15 +17,12 @@
  *  under the License.
  */
 dependencies {
-    api("javax.servlet:javax.servlet-api:$servletApiVersion") { dep ->
-        provided dep
-    }
-    api("javax.servlet.jsp:javax.servlet.jsp-api:$jspApiVersion") { dep ->
-        provided dep
+    api rootProject  // ServletBinding extends Binding...
+    api "javax.servlet:javax.servlet-api:$servletApiVersion"
+    api("javax.servlet.jsp:javax.servlet.jsp-api:$jspApiVersion") {
         exclude(group: 'javax.servlet', module: 'javax.servlet-api')
     }
 
-    api rootProject  // ServletBinding extends Binding...
     implementation project(':groovy-xml') // needed for MarkupBuilder
     implementation project(':groovy-templates') // needed by TemplateServlet