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

Update build dependencies to newer versions.

parent fdff3ab2
image: gradle:6.3-jdk8
image: gradle:6.7.1-jdk11
variables:
# Set the location of the dependency cache to a local directory, so that it
......
......@@ -3451,7 +3451,6 @@ public class ClassReader {
private int[] readBootstrapMethodsAttribute(final int maxStringLength) {
char[] charBuffer = new char[maxStringLength];
int currentAttributeOffset = getFirstAttributeOffset();
int[] currentBootstrapMethodOffsets = null;
for (int i = readUnsignedShort(currentAttributeOffset - 2); i > 0; --i) {
// Read the attribute_info's attribute_name and attribute_length fields.
String attributeName = readUTF8(currentAttributeOffset, charBuffer);
......@@ -3459,17 +3458,17 @@ public class ClassReader {
currentAttributeOffset += 6;
if (Constants.BOOTSTRAP_METHODS.equals(attributeName)) {
// Read the num_bootstrap_methods field and create an array of this size.
currentBootstrapMethodOffsets = new int[readUnsignedShort(currentAttributeOffset)];
int[] bootstrapMethodOffsets = new int[readUnsignedShort(currentAttributeOffset)];
// Compute and store the offset of each 'bootstrap_methods' array field entry.
int currentBootstrapMethodOffset = currentAttributeOffset + 2;
for (int j = 0; j < currentBootstrapMethodOffsets.length; ++j) {
currentBootstrapMethodOffsets[j] = currentBootstrapMethodOffset;
for (int j = 0; j < bootstrapMethodOffsets.length; ++j) {
bootstrapMethodOffsets[j] = currentBootstrapMethodOffset;
// Skip the bootstrap_method_ref and num_bootstrap_arguments fields (2 bytes each),
// as well as the bootstrap_arguments array field (of size num_bootstrap_arguments * 2).
currentBootstrapMethodOffset +=
4 + readUnsignedShort(currentBootstrapMethodOffset + 2) * 2;
}
return currentBootstrapMethodOffsets;
return bootstrapMethodOffsets;
}
currentAttributeOffset += attributeLength;
}
......
......@@ -358,7 +358,7 @@ public class ClassVisitorTest extends AsmTest {
public ModuleVisitor visitModule(final String name, final int access, final String version) {
return new ModuleVisitor(api, super.visitModule(name, access, version)) {};
}
};
}
private static class FieldAdapter extends FieldVisitor {
......
......@@ -28,13 +28,13 @@
buildscript {
repositories { mavenCentral() }
dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.1' }
dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.3' }
}
plugins { id 'biz.aQute.bnd.builder' version '5.0.1' apply false }
plugins { id 'biz.aQute.bnd.builder' version '5.2.0' apply false }
plugins { id 'com.github.sherter.google-java-format' version '0.9' apply false }
plugins { id 'me.champeau.gradle.jmh' version '0.5.0' apply false }
plugins { id 'org.sonarqube' version '2.8' apply false }
plugins { id 'me.champeau.gradle.jmh' version '0.5.2' apply false }
plugins { id 'org.sonarqube' version '3.0' apply false }
description = 'ASM, a very small and fast Java bytecode manipulation framework'
......@@ -82,8 +82,8 @@ project(':asm-commons') {
project(':asm-test') {
description = "Utilities for testing ${parent.description}"
provides = ['org.objectweb.asm.test']
depends = ['org.junit.jupiter:junit-jupiter-api:5.6.1',
'org.junit.jupiter:junit-jupiter-params:5.6.1']
depends = ['org.junit.jupiter:junit-jupiter-api:5.7.0',
'org.junit.jupiter:junit-jupiter-params:5.7.0']
}
project(':asm-tree') {
......@@ -153,7 +153,7 @@ project(':tools:bnd-module-plugin') {
description = "bnd plugin to build moduleinfo with ${rootProject.description}"
// 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
depends = ['biz.aQute.bnd:biz.aQute.bnd:4.0.0']
depends = ['biz.aQute.bnd:biz.aQute.bnd:5.2.0']
}
project(':tools:retrofitter') {
......@@ -170,7 +170,7 @@ project(':tools:retrofitter') {
// and tested with :asm-test and JUnit.
subprojects {
apply plugin: 'com.github.sherter.google-java-format'
googleJavaFormat.toolVersion = '1.7'
googleJavaFormat.toolVersion = '1.9'
googleJavaFormat.exclude 'src/resources/java/**/*'
// Check the coding style with Checkstyle. Fail in case of error or warning.
......@@ -188,9 +188,9 @@ subprojects {
dependencies {
requires.each { projectName -> api project(projectName) }
depends.each { artifactName -> api artifactName }
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1',
'org.junit.jupiter:junit-jupiter-params:5.6.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0',
'org.junit.jupiter:junit-jupiter-params:5.7.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
testImplementation project(':asm-test')
}
......
......@@ -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-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
......@@ -86,11 +86,9 @@
<module name="JavadocMethod">
<property name="scope" value="public" />
<property name="allowMissingParamTags" value="true" />
<property name="allowMissingThrowsTags" value="true" />
<property name="allowMissingReturnTag" value="true" />
<property name="allowedAnnotations"
value="Override,BeforeEach,Test,ParameterizedTest,Setup,Benchmark" />
<property name="allowThrowsTagsForSubclasses" value="true" />
</module>
<module name="MethodName">
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$" />
......
......@@ -38,8 +38,7 @@
<!-- Already covered with google-java-format. -->
<exclude name="OneDeclarationPerLine" />
<!-- Actually not a best practice. -->
<exclude name="PositionLiteralsFirstInCaseInsensitiveComparisons" />
<exclude name="PositionLiteralsFirstInComparisons" />
<exclude name="LiteralsFirstInComparisons" />
<!-- Already covered with Checkstyle 'MissingSwitchDefault' rule. -->
<exclude name="SwitchStmtsShouldHaveDefault" />
<!-- Already covered with google-java-format. -->
......
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