Change Opcodes.ASM4 to Opcodes.ASM5, to work with java8 lambdas. Also update opensource build to ASM 5.0.1.
I'm not confident this will 100% solve every issue... we may need to update cglib also to use OpCodes.ASM5. Should do some testing w/ AOP over things with default methods & lambdas.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=64557004
diff --git a/build.xml b/build.xml
index 09acb0d..0907b73 100644
--- a/build.xml
+++ b/build.xml
@@ -254,7 +254,7 @@
<arg value="-DNO_AOP" />
</munge>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-5.0.jar"/>]]></replacetoken>
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-5.0.1.jar"/>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value="">
<replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"/>]]></replacetoken>
diff --git a/common.xml b/common.xml
index 8fbb19a..a160759 100644
--- a/common.xml
+++ b/common.xml
@@ -145,7 +145,7 @@
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
<fileset dir="${build.dir}/classes"/>
<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"/>
- <zipfileset src="${common.basedir}/lib/build/asm-5.0.jar"/>
+ <zipfileset src="${common.basedir}/lib/build/asm-5.0.1.jar"/>
<rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
<rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
<rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
diff --git a/core/pom.xml b/core/pom.xml
index ffb78ab..91dfe0a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>5.0</version>
+ <version>5.0.1</version>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/core/src/com/google/inject/internal/util/LineNumbers.java b/core/src/com/google/inject/internal/util/LineNumbers.java
index 7c133cb..57c98b9 100644
--- a/core/src/com/google/inject/internal/util/LineNumbers.java
+++ b/core/src/com/google/inject/internal/util/LineNumbers.java
@@ -129,7 +129,7 @@
private String name;
LineNumberReader() {
- super(Opcodes.ASM4);
+ super(Opcodes.ASM5);
}
public void visit(int version, int access, String name, String signature,
@@ -179,7 +179,7 @@
class LineNumberMethodVisitor extends MethodVisitor {
LineNumberMethodVisitor() {
- super(Opcodes.ASM4);
+ super(Opcodes.ASM5);
}
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
@@ -205,7 +205,7 @@
class LineNumberAnnotationVisitor extends AnnotationVisitor {
LineNumberAnnotationVisitor() {
- super(Opcodes.ASM4);
+ super(Opcodes.ASM5);
}
public AnnotationVisitor visitAnnotation(String name, String desc) {
return this;
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 55ee9b8..ff287a4 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>5.0</version>
+ <version>5.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/lib/build/asm-5.0.1.jar b/lib/build/asm-5.0.1.jar
new file mode 100644
index 0000000..9f9be04
--- /dev/null
+++ b/lib/build/asm-5.0.1.jar
Binary files differ
diff --git a/lib/build/asm-5.0.jar b/lib/build/asm-5.0.jar
deleted file mode 100644
index 40502a6..0000000
--- a/lib/build/asm-5.0.jar
+++ /dev/null
Binary files differ