From e66366eaf5a6b51597e89b613e5c9f299af9faf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= Date: Wed, 28 Apr 2021 15:16:46 +0200 Subject: [PATCH] Remove ASM dependency --- build.gradle | 2 -- gradle/dependencies.gradle | 2 -- .../org/mockitoutil/SimpleClassGenerator.java | 18 ++---------------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index fdbe331d40..aa273359ee 100644 --- a/build.gradle +++ b/build.gradle @@ -86,8 +86,6 @@ dependencies { compileOnly libraries.junit4, libraries.hamcrest, libraries.opentest4j compile libraries.objenesis - testCompile libraries.asm - testCompile libraries.assertj //putting 'provided' dependencies on test compile and runtime classpath diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 570e6dcd21..e702005e28 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -28,8 +28,6 @@ libraries.autoservice = "com.google.auto.service:auto-service:1.0" libraries.objenesis = 'org.objenesis:objenesis:3.2' -libraries.asm = 'org.ow2.asm:asm:7.0' - libraries.osgi = 'org.osgi:osgi.core:8.0.0' libraries.equinox = 'org.eclipse.platform:org.eclipse.osgi:3.16.200' libraries.bndGradle = 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0' diff --git a/src/test/java/org/mockitoutil/SimpleClassGenerator.java b/src/test/java/org/mockitoutil/SimpleClassGenerator.java index 26ce9e837c..9ec5194471 100644 --- a/src/test/java/org/mockitoutil/SimpleClassGenerator.java +++ b/src/test/java/org/mockitoutil/SimpleClassGenerator.java @@ -4,25 +4,11 @@ */ package org.mockitoutil; -import static org.objectweb.asm.Opcodes.*; - -import org.objectweb.asm.ClassWriter; +import net.bytebuddy.ByteBuddy; public class SimpleClassGenerator { public static byte[] makeMarkerInterface(String qualifiedName) { - String relativePath = qualifiedName.replace('.', '/'); - - ClassWriter cw = new ClassWriter(0); - cw.visit( - V1_6, - ACC_PUBLIC + ACC_ABSTRACT + ACC_INTERFACE, - relativePath, - null, - "java/lang/Object", - null); - cw.visitEnd(); - - return cw.toByteArray(); + return new ByteBuddy().makeInterface().name(qualifiedName).make().getBytes(); } }