From 22289161515b34689da70365a9e0549c7aafc994 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Fri, 19 Dec 2014 18:10:05 -0800 Subject: Update ADT with ASM 5.0.3 Change-Id: I03d846ce1bf9210ca8c35da9cf11a395fd950251 --- eclipse/build.gradle | 6 +++--- eclipse/plugins/com.android.ide.eclipse.adt/.classpath | 6 +++--- eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF | 6 +++--- .../eclipse/adt/internal/resources/manager/ProjectClassLoader.java | 2 +- eclipse/plugins/com.android.ide.eclipse.tests/.classpath | 6 +++--- eclipse/scripts/create_all_symlinks.sh | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'eclipse') diff --git a/eclipse/build.gradle b/eclipse/build.gradle index dd1db05..4c7a41c 100644 --- a/eclipse/build.gradle +++ b/eclipse/build.gradle @@ -63,9 +63,9 @@ def artifacts = [ // prebuilts 'ant-glob' : 'com.android.tools.external:ant-glob:1.0', - 'asm-4.0' : 'org.ow2.asm:asm:4.0', - 'asm-analysis-4.0' : 'org.ow2.asm:asm-analysis:4.0', - 'asm-tree-4.0' : 'org.ow2.asm:asm-tree:4.0', + 'asm-5.0.3' : 'org.ow2.asm:asm:5.0.3', + 'asm-analysis-5.0.3' : 'org.ow2.asm:asm-analysis:5.0.3', + 'asm-tree-5.0.3' : 'org.ow2.asm:asm-tree:5.0.3', 'commons-codec-1.4' : 'commons-codec:commons-codec:1.4', 'commons-compress-1.0' : 'org.apache.commons:commons-compress:1.8.1', 'commons-logging-1.1.1' : 'commons-logging:commons-logging:1.1.1', diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath index fcf27a5..4476b4c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath @@ -14,9 +14,9 @@ - - - + + + diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF index 9c8158b..5f20b0f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF @@ -12,9 +12,9 @@ Bundle-ClassPath: ., libs/lint-api.jar, libs/lint-checks.jar, libs/lombok-ast-0.2.2.jar, - libs/asm-4.0.jar, - libs/asm-tree-4.0.jar, - libs/asm-analysis-4.0.jar, + libs/asm-5.0.3.jar, + libs/asm-tree-5.0.3.jar, + libs/asm-analysis-5.0.3.jar, libs/propertysheet.jar, libs/ant-glob.jar, libs/swtmenubar.jar, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java index 38460a4..e07f099 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java @@ -177,7 +177,7 @@ public final class ProjectClassLoader extends ClassLoader { public static byte[] rewriteClass(byte[] classData, final int maxVersion, final int minVersion) { assert maxVersion >= minVersion; ClassWriter classWriter = new ClassWriter(0); - ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM4, classWriter) { + ClassVisitor classVisitor = new ClassVisitor(Opcodes.ASM5, classWriter) { @Override public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath index 83bfa23..af8e888 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath @@ -17,8 +17,8 @@ - - - + + + diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh index e3cef1a..ff8a4b0 100755 --- a/eclipse/scripts/create_all_symlinks.sh +++ b/eclipse/scripts/create_all_symlinks.sh @@ -156,9 +156,9 @@ ADT_LIBS="make:ant-glob base:asset-studio base:lint-api base:lint-checks base:ni base:rule-api swt:sdkuilib swt:swtmenubar base:manifest-merger" ADT_PREBUILTS="\ prebuilts/tools/common/freemarker/freemarker-2.3.19.jar \ - prebuilts/tools/common/m2/repository/org/ow2/asm/asm/4.0/asm-4.0.jar \ - prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar \ - prebuilts/tools/common/m2/repository/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar \ + prebuilts/tools/common/m2/repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar \ + prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar \ + prebuilts/tools/common/m2/repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar \ prebuilts/tools/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar" LIBS="$LIBS $ADT_LIBS" -- cgit v1.1