[groovy] branch GROOVY_3_0_X updated: minor refactor

[pa...@apache.org]

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

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new 6fc5134c99 minor refactor
6fc5134c99 is described below

commit 6fc5134c9985a42fa3fa58373c407af44d944a77
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Apr 12 17:46:06 2022 +1000

    minor refactor
---
 .../groovy/org/codehaus/groovy/gradle/ReleaseInfoGenerator.groovy     | 4 ++--
 gradle/assemble.gradle                                                | 2 ++
 src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

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 7e915f8369..b83e027153 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/gradle/assemble.gradle b/gradle/assemble.gradle
index 9cb26cff76..a074decd1f 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/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
index 6e7ccf5fdb..20c0248022 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ProxyGeneratorAdapter.java
@@ -170,7 +170,7 @@ 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);