Commit fef9e73c authored by Eric Bruneton's avatar Eric Bruneton
Browse files

Merge branch 'upgrade-gradle-version' into 'master'

Upgrade Gradle to 7.4.1 version, and plugins to latest versions.

See merge request asm/asm!333
parents aea18767 b11efc51
image: gradle:7.3.3-jdk11 image: gradle:7.4.1-jdk11
variables: variables:
# Set the location of the dependency cache to a local directory, so that it # Set the location of the dependency cache to a local directory, so that it
......
...@@ -202,7 +202,7 @@ public class ClassFile { ...@@ -202,7 +202,7 @@ public class ClassFile {
for (Class<?> parameterType : constructor.getParameterTypes()) { for (Class<?> parameterType : constructor.getParameterTypes()) {
arguments.add(Array.get(Array.newInstance(parameterType, 1), 0)); arguments.add(Array.get(Array.newInstance(parameterType, 1), 0));
} }
constructor.setAccessible(true); constructor.setAccessible(true); // NOPMD(AvoidAccessibilityAlteration): ok for tests.
return constructor.newInstance(arguments.toArray(new Object[0])); return constructor.newInstance(arguments.toArray(new Object[0]));
} }
return null; return null;
......
...@@ -215,7 +215,7 @@ class CheckMethodAdapterTest extends AsmTest implements Opcodes { ...@@ -215,7 +215,7 @@ class CheckMethodAdapterTest extends AsmTest implements Opcodes {
checkMethodAdapter.visitInsn(NOP); checkMethodAdapter.visitInsn(NOP);
Executable visitFrame = Executable visitFrame =
() -> checkMethodAdapter.visitFrame(F_FULL, 1, new Object[] {new Float(0.0f)}, 0, null); () -> checkMethodAdapter.visitFrame(F_FULL, 1, new Object[] {Float.valueOf(0.0f)}, 0, null);
Exception exception = assertThrows(IllegalArgumentException.class, visitFrame); Exception exception = assertThrows(IllegalArgumentException.class, visitFrame);
assertEquals("Invalid stack frame value: 0.0", exception.getMessage()); assertEquals("Invalid stack frame value: 0.0", exception.getMessage());
......
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
buildscript { buildscript {
repositories { mavenCentral() } repositories { mavenCentral() }
dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.3' } dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.5' }
} }
plugins { id 'biz.aQute.bnd.builder' version '6.1.0' apply false } plugins { id 'biz.aQute.bnd.builder' version '6.2.0' apply false }
plugins { id 'com.github.sherter.google-java-format' version '0.9' apply false } plugins { id 'com.github.sherter.google-java-format' version '0.9' apply false }
plugins { id 'me.champeau.gradle.jmh' version '0.5.3' apply false } plugins { id 'me.champeau.gradle.jmh' version '0.5.3' apply false }
plugins { id 'org.sonarqube' version '3.3' apply false } plugins { id 'org.sonarqube' version '3.3' apply false }
...@@ -163,7 +163,7 @@ project(':tools:bnd-module-plugin') { ...@@ -163,7 +163,7 @@ project(':tools:bnd-module-plugin') {
description = "bnd plugin to build moduleinfo with ${rootProject.description}" description = "bnd plugin to build moduleinfo with ${rootProject.description}"
// TODO: this compiles asm twice (here and in :asm), find a way to avoid this. // TODO: this compiles asm twice (here and in :asm), find a way to avoid this.
sourceSets.main.java.srcDirs += project(':asm').sourceSets.main.java.srcDirs sourceSets.main.java.srcDirs += project(':asm').sourceSets.main.java.srcDirs
depends = ['biz.aQute.bnd:biz.aQute.bnd:6.1.0'] depends = ['biz.aQute.bnd:biz.aQute.bnd:6.2.0']
} }
project(':tools:retrofitter') { project(':tools:retrofitter') {
...@@ -180,7 +180,7 @@ project(':tools:retrofitter') { ...@@ -180,7 +180,7 @@ project(':tools:retrofitter') {
// and tested with :asm-test and JUnit. // and tested with :asm-test and JUnit.
subprojects { subprojects {
apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'com.github.sherter.google-java-format'
googleJavaFormat.toolVersion = '1.13.0' googleJavaFormat.toolVersion = '1.15.0'
googleJavaFormat.exclude 'src/resources/java/**/*' googleJavaFormat.exclude 'src/resources/java/**/*'
// Check the coding style with Checkstyle. Fail in case of error or warning. // Check the coding style with Checkstyle. Fail in case of error or warning.
......
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<exclude name="StaticEJBFieldShouldBeFinal" /> <exclude name="StaticEJBFieldShouldBeFinal" />
<exclude name="UseProperClassLoader" /> <exclude name="UseProperClassLoader" />
</rule> </rule>
<rule ref="category/java/errorprone.xml/ReturnEmptyArrayRatherThanNull"> <rule ref="category/java/errorprone.xml/ReturnEmptyCollectionRatherThanNull">
<properties> <properties>
<property name="violationSuppressXPath" <property name="violationSuppressXPath"
value="//MethodDeclaration[@Private='true']"/> value="//MethodDeclaration[@Private='true']"/>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment