diff options
| author | Eric Bruneton <ebruneton@free.fr> | 2022-12-19 08:29:56 +0100 |
|---|---|---|
| committer | Eric Bruneton <ebruneton@free.fr> | 2022-12-19 08:31:56 +0100 |
| commit | a3d3933a0a05ecb5d3cc5937043546e2a607c58c (patch) | |
| tree | 24626afb1659503fc61375707ca609b4ac4c5490 | |
| parent | d648961d310264c2d6d6db4c17b64a94c96c23ce (diff) | |
| download | ow2-asm-a3d3933a0a05ecb5d3cc5937043546e2a607c58c.tar.gz | |
Upgrade Gradle to 7.6 version.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | asm-tree/src/main/java/org/objectweb/asm/tree/InvokeDynamicInsnNode.java | 4 | ||||
| -rw-r--r-- | benchmarks/src/jmh/java/org/objectweb/asm/benchmarks/Adapter.java | 7 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | tools/checkstyle.xml | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cfedfd9..fa32f617 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: gradle:7.4.1-jdk11 +image: gradle:7.6-jdk11 variables: # Set the location of the dependency cache to a local directory, so that it diff --git a/asm-tree/src/main/java/org/objectweb/asm/tree/InvokeDynamicInsnNode.java b/asm-tree/src/main/java/org/objectweb/asm/tree/InvokeDynamicInsnNode.java index 8bb87124..8c0a1c63 100644 --- a/asm-tree/src/main/java/org/objectweb/asm/tree/InvokeDynamicInsnNode.java +++ b/asm-tree/src/main/java/org/objectweb/asm/tree/InvokeDynamicInsnNode.java @@ -66,12 +66,12 @@ public class InvokeDynamicInsnNode extends AbstractInsnNode { final String name, final String descriptor, final Handle bootstrapMethodHandle, - final Object... bootstrapMethodArguments) { // NOPMD(ArrayIsStoredDirectly): public field. + final Object... bootstrapMethodArguments) { super(Opcodes.INVOKEDYNAMIC); this.name = name; this.desc = descriptor; this.bsm = bootstrapMethodHandle; - this.bsmArgs = bootstrapMethodArguments; + this.bsmArgs = bootstrapMethodArguments; // NOPMD(ArrayIsStoredDirectly): public field. } @Override diff --git a/benchmarks/src/jmh/java/org/objectweb/asm/benchmarks/Adapter.java b/benchmarks/src/jmh/java/org/objectweb/asm/benchmarks/Adapter.java index 6b72491c..8a478027 100644 --- a/benchmarks/src/jmh/java/org/objectweb/asm/benchmarks/Adapter.java +++ b/benchmarks/src/jmh/java/org/objectweb/asm/benchmarks/Adapter.java @@ -134,14 +134,11 @@ public abstract class Adapter { * @param interfaces the internal names of the class's interfaces */ public ClassInfo( - final int access, - final String name, - final String superClass, - final String[] interfaces) { // NOPMD(ArrayIsStoredDirectly): non public API. + final int access, final String name, final String superClass, final String[] interfaces) { this.access = access; this.name = name; this.superClass = superClass; - this.interfaces = interfaces; + this.interfaces = interfaces; // NOPMD(ArrayIsStoredDirectly): non public API. } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4462a0e4..565bc3a9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/tools/checkstyle.xml b/tools/checkstyle.xml index 2e7ed7cf..b2648ea5 100644 --- a/tools/checkstyle.xml +++ b/tools/checkstyle.xml @@ -84,7 +84,7 @@ value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF" /> </module> <module name="JavadocMethod"> - <property name="scope" value="public" /> + <property name="accessModifiers" value="public" /> <property name="allowMissingParamTags" value="true" /> <property name="allowMissingReturnTag" value="true" /> <property name="allowedAnnotations" |