diff options
author | Eric Bruneton <ebruneton@free.fr> | 2022-12-19 09:48:03 +0100 |
---|---|---|
committer | Eric Bruneton <ebruneton@free.fr> | 2022-12-19 09:48:03 +0100 |
commit | 2ff73afb93655c757fc768f2ed7fda8c9fcc83e7 (patch) | |
tree | 9f6ecc40e546b885752b0aeb00e9aacceb59f42e | |
parent | a3d3933a0a05ecb5d3cc5937043546e2a607c58c (diff) | |
download | ow2-asm-2ff73afb93655c757fc768f2ed7fda8c9fcc83e7.tar.gz |
Upgrade the dependencies to the latest versions.
-rw-r--r-- | asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java | 5 | ||||
-rw-r--r-- | build.gradle | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java b/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java index e616042f..252a7b59 100644 --- a/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java +++ b/asm-util/src/test/java/org/objectweb/asm/util/ASMifierTest.java @@ -40,6 +40,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; import org.codehaus.commons.compiler.CompileException; import org.codehaus.janino.ClassLoaderIClassLoader; import org.codehaus.janino.IClassLoader; @@ -108,10 +109,12 @@ class ASMifierTest extends AsmTest { private static byte[] compile(final String name, final String source) throws IOException { Parser parser = new Parser(new Scanner(name, new StringReader(source))); + ArrayList<org.codehaus.janino.util.ClassFile> generatedClassFiles = new ArrayList<>(); try { UnitCompiler unitCompiler = new UnitCompiler(parser.parseAbstractCompilationUnit(), ICLASS_LOADER); - return unitCompiler.compileUnit(true, true, true)[0].toByteArray(); + unitCompiler.compileUnit(true, true, true, generatedClassFiles); + return generatedClassFiles.get(0).toByteArray(); } catch (CompileException e) { throw new AssertionError(source, e); } diff --git a/build.gradle b/build.gradle index a9928392..d76742bb 100644 --- a/build.gradle +++ b/build.gradle @@ -31,10 +31,10 @@ buildscript { dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.5' } } -plugins { id 'biz.aQute.bnd.builder' version '6.2.0' apply false } +plugins { id 'biz.aQute.bnd.builder' version '6.4.0' apply false } plugins { id 'com.github.sherter.google-java-format' version '0.9' apply false } -plugins { id 'me.champeau.jmh' version '0.6.6' apply false } -plugins { id 'org.sonarqube' version '3.3' apply false } +plugins { id 'me.champeau.jmh' version '0.6.8' apply false } +plugins { id 'org.sonarqube' version '3.5.0.2730' apply false } description = 'ASM, a very small and fast Java bytecode manipulation framework' @@ -96,8 +96,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.8.2', - 'org.junit.jupiter:junit-jupiter-params:5.8.2'] + depends = ['org.junit.jupiter:junit-jupiter-api:5.9.1', + 'org.junit.jupiter:junit-jupiter-params:5.9.1'] } project(':asm-tree') { @@ -110,7 +110,7 @@ project(':asm-util') { description = "Utilities for ${parent.description}" provides = ['org.objectweb.asm.util'] requires = [':asm', ':asm-tree', ':asm-analysis'] - dependencies { testImplementation 'org.codehaus.janino:janino:3.1.6' } + dependencies { testImplementation 'org.codehaus.janino:janino:3.1.9' } } // Use "gradle benchmarks:jmh [-PjmhInclude='<regex>']" to run the benchmarks. @@ -197,9 +197,9 @@ subprojects { dependencies { requires.each { projectName -> api project(projectName) } depends.each { artifactName -> api artifactName } - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2', - 'org.junit.jupiter:junit-jupiter-params:5.8.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1', + 'org.junit.jupiter:junit-jupiter-params:5.9.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1' testImplementation project(':asm-test') } |