Fix: breaking changes in dexlib2

defold · Jun 13, 2018 · 18e8458 · 18e8458
1 parent 10fcaf5
commit 18e8458
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/server/src/test/java/com/defold/extender/IntegrationTest.java b/server/src/test/java/com/defold/extender/IntegrationTest.java
@@ -4,6 +4,7 @@
 import com.google.common.collect.Lists;
 import org.apache.commons.io.FileUtils;
 import org.jf.dexlib2.DexFileFactory;
+import org.jf.dexlib2.Opcodes;
 import org.jf.dexlib2.iface.ClassDef;
 import org.jf.dexlib2.iface.DexFile;
 import org.junit.AfterClass;
@@ -300,7 +301,7 @@ public void buildAndroidCheckClassesDex() throws IOException, ExtenderClientExce
         Files.copy(in, tmpClassesDexPath, StandardCopyOption.REPLACE_EXISTING);
 
         // Verify that classes.dex contains our Dummy class
-        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), 19 ); // api level
+        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), Opcodes.forApi(19));
         Set<String> dexClasses = new HashSet<>();
         for (ClassDef classDef: dexFile.getClasses()) {
             dexClasses.add(classDef.getType());
@@ -361,7 +362,7 @@ public void buildAndroidCheckClassesMultiDex() throws IOException, ExtenderClien
         Files.copy(in, tmpClassesDexPath, StandardCopyOption.REPLACE_EXISTING);
 
         // Verify that classes.dex contains our Dummy class
-        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), 19 ); // api level
+        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), Opcodes.forApi(19));
         Set<String> dexClasses = new HashSet<>();
         for (ClassDef classDef: dexFile.getClasses()) {
             dexClasses.add(classDef.getType());
@@ -421,7 +422,7 @@ public void buildAndroidCheckCompiledJava() throws IOException, ExtenderClientEx
         Files.copy(in, tmpClassesDexPath, StandardCopyOption.REPLACE_EXISTING);
 
         // Verify that classes.dex contains our Dummy class and our compiled Java class
-        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), 19 ); // api level
+        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), Opcodes.forApi(19));
         Set<String> dexClasses = new HashSet<>();
         for (ClassDef classDef: dexFile.getClasses()) {
             dexClasses.add(classDef.getType());
@@ -485,7 +486,7 @@ public void buildAndroidJavaJarDependency() throws IOException, ExtenderClientEx
         Files.copy(in, tmpClassesDexPath, StandardCopyOption.REPLACE_EXISTING);
 
         // Verify that classes.dex contains our Dummy class and our compiled Java class
-        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), 19 ); // api level
+        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), Opcodes.forApi(19));
         Set<String> dexClasses = new HashSet<>();
         for (ClassDef classDef: dexFile.getClasses()) {
             dexClasses.add(classDef.getType());
@@ -545,7 +546,7 @@ public void buildAndroidRJar() throws IOException, ExtenderClientException, Inte
         Files.copy(in, tmpClassesDexPath, StandardCopyOption.REPLACE_EXISTING);
 
         // Verify that classes.dex contains our Dummy class and our compiled Java class
-        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), 19 ); // api level
+        DexFile dexFile = DexFileFactory.loadDexFile(tmpClassesDexPath.toFile().getAbsolutePath(), Opcodes.forApi(19));
         Set<String> dexClasses = new HashSet<>();
         for (ClassDef classDef: dexFile.getClasses()) {
             dexClasses.add(classDef.getType());