Snap for 8901046 from ce907474c2c6f1ddab3f6ae82f7b33363165ac90 to gki13-boot-release

Change-Id: Ic8045bcacc408b91d34f2189576066aa0c3d2cc4

2 files changed, 3 insertions, 3 deletions

diff --git a/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInstrumentor.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInstrumentor.java
index 8997be4b2..ebe36c66f 100644
--- a/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInstrumentor.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInstrumentor.java
@@ -42,7 +42,7 @@ public abstract class ClassInstrumentor {
       final InstrumentationConfiguration config,
       ClassNodeProvider classNodeProvider) {
     ClassNode classNode =
-        new ClassNode(Opcodes.ASM4) {
+        new ClassNode(Opcodes.ASM9) {
           @Override
           public FieldVisitor visitField(
               int access, String name, String desc, String signature, Object value) {
@@ -366,7 +366,7 @@ public abstract class ClassInstrumentor {
 
   //todo rename
   private MethodNode redirectorMethod(MutableClass mutableClass, MethodNode method, String newName) {
-    MethodNode redirector = new MethodNode(Opcodes.ASM4, newName, method.desc, method.signature, exceptionArray(method));
+    MethodNode redirector = new MethodNode(Opcodes.ASM9, newName, method.desc, method.signature, exceptionArray(method));
     redirector.access = method.access & ~(Opcodes.ACC_NATIVE | Opcodes.ACC_ABSTRACT | Opcodes.ACC_FINAL);
     makeMethodPrivate(redirector);
     RobolectricGeneratorAdapter generator = new RobolectricGeneratorAdapter(redirector);
diff --git a/sandbox/src/main/java/org/robolectric/internal/bytecode/RobolectricGeneratorAdapter.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/RobolectricGeneratorAdapter.java
index 1569c379c..14ab0415d 100644
--- a/sandbox/src/main/java/org/robolectric/internal/bytecode/RobolectricGeneratorAdapter.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/RobolectricGeneratorAdapter.java
@@ -18,7 +18,7 @@ class RobolectricGeneratorAdapter extends GeneratorAdapter {
   private final String desc;
 
   public RobolectricGeneratorAdapter(MethodNode methodNode) {
-    super(Opcodes.ASM4, methodNode, methodNode.access, methodNode.name, methodNode.desc);
+    super(Opcodes.ASM9, methodNode, methodNode.access, methodNode.name, methodNode.desc);
     this.isStatic = Modifier.isStatic(methodNode.access);
     this.desc = methodNode.desc;
   }