diff --git a/build.gradle b/build.gradle
index 467b362..b420a5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ plugins {
     id 'signing'
 }
 
-def dexlib2Version = '2.3.4'
+def dexlib2Version = '3.0.3'
 def multidexlib2VersionSuffix = '.r2'
 
 group = 'com.github.lanchon.dexpatcher'
@@ -23,17 +23,19 @@ version = dexlib2Version + multidexlib2VersionSuffix
 ext.mainArtifact = 'multidexlib2'
 ext.artifactName = mainArtifact
 
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 def jdk = findProperty('JDK7_HOME') as String ?: '/usr/lib/jvm/java-7-openjdk-amd64'
 def jdk_rt = new File(jdk, 'jre/lib/rt.jar')
 if (jdk_rt.exists()) compileJava.options.bootstrapClasspath = files(jdk_rt)
 
 repositories {
     jcenter()
+    google()
 }
 
 dependencies {
-    api 'org.smali:dexlib2:' + dexlib2Version
+    api 'com.android.tools.smali:smali-dexlib2:' + dexlib2Version
+    api 'com.google.guava:guava:32.0.1-jre'
 }
 
 apply from: 'configure-artifacts.gradle'
diff --git a/src/main/java/lanchon/multidexlib2/AbstractMultiDexContainer.java b/src/main/java/lanchon/multidexlib2/AbstractMultiDexContainer.java
index f793081..758e623 100644
--- a/src/main/java/lanchon/multidexlib2/AbstractMultiDexContainer.java
+++ b/src/main/java/lanchon/multidexlib2/AbstractMultiDexContainer.java
@@ -15,8 +15,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jf.dexlib2.iface.DexFile;
-import org.jf.dexlib2.iface.MultiDexContainer;
+import com.android.tools.smali.dexlib2.iface.DexFile;
+import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
 
 public abstract class AbstractMultiDexContainer<T extends DexFile> implements MultiDexContainer<T> {
 
diff --git a/src/main/java/lanchon/multidexlib2/BasicDexEntry.java b/src/main/java/lanchon/multidexlib2/BasicDexEntry.java
index 8a94cbf..7066bc4 100644
--- a/src/main/java/lanchon/multidexlib2/BasicDexEntry.java
+++ b/src/main/java/lanchon/multidexlib2/BasicDexEntry.java
@@ -10,9 +10,9 @@
 
 package lanchon.multidexlib2;
 
-import org.jf.dexlib2.iface.DexFile;
-import org.jf.dexlib2.iface.MultiDexContainer;
-import org.jf.dexlib2.iface.MultiDexContainer.DexEntry;
+import com.android.tools.smali.dexlib2.iface.DexFile;
+import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
+import com.android.tools.smali.dexlib2.iface.MultiDexContainer.DexEntry;
 
 public class BasicDexEntry<C extends MultiDexContainer< /* ? extends */ D>, D extends DexFile>
 		implements DexEntry<D> {
diff --git a/src/main/java/lanchon/multidexlib2/DexIO.java b/src/main/java/lanchon/multidexlib2/DexIO.java
index 65edab4..97227f6 100644
--- a/src/main/java/lanchon/multidexlib2/DexIO.java
+++ b/src/main/java/lanchon/multidexlib2/DexIO.java
@@ -26,13 +26,13 @@
 
 import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.iface.ClassDef;
-import org.jf.dexlib2.iface.DexFile;
-import org.jf.dexlib2.writer.DexWriter;
-import org.jf.dexlib2.writer.io.DexDataStore;
-import org.jf.dexlib2.writer.io.FileDataStore;
-import org.jf.dexlib2.writer.pool.DexPool;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.iface.ClassDef;
+import com.android.tools.smali.dexlib2.iface.DexFile;
+import com.android.tools.smali.dexlib2.writer.DexWriter;
+import com.android.tools.smali.dexlib2.writer.io.DexDataStore;
+import com.android.tools.smali.dexlib2.writer.io.FileDataStore;
+import com.android.tools.smali.dexlib2.writer.pool.DexPool;
 
 public class DexIO {
 
diff --git a/src/main/java/lanchon/multidexlib2/DirectoryDexContainer.java b/src/main/java/lanchon/multidexlib2/DirectoryDexContainer.java
index eb37145..0ed8ae8 100644
--- a/src/main/java/lanchon/multidexlib2/DirectoryDexContainer.java
+++ b/src/main/java/lanchon/multidexlib2/DirectoryDexContainer.java
@@ -15,8 +15,8 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
 
 public class DirectoryDexContainer extends AbstractMultiDexContainer<DexBackedDexFile> {
 
diff --git a/src/main/java/lanchon/multidexlib2/MultiDexContainerBackedDexFile.java b/src/main/java/lanchon/multidexlib2/MultiDexContainerBackedDexFile.java
index 2ac74a4..ad5329a 100644
--- a/src/main/java/lanchon/multidexlib2/MultiDexContainerBackedDexFile.java
+++ b/src/main/java/lanchon/multidexlib2/MultiDexContainerBackedDexFile.java
@@ -16,10 +16,10 @@
 import java.util.List;
 import java.util.Set;
 
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.iface.ClassDef;
-import org.jf.dexlib2.iface.DexFile;
-import org.jf.dexlib2.iface.MultiDexContainer;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.iface.ClassDef;
+import com.android.tools.smali.dexlib2.iface.DexFile;
+import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
 
 public class MultiDexContainerBackedDexFile<T extends DexFile> implements DexFile {
 
diff --git a/src/main/java/lanchon/multidexlib2/MultiDexIO.java b/src/main/java/lanchon/multidexlib2/MultiDexIO.java
index dbfead3..0815493 100644
--- a/src/main/java/lanchon/multidexlib2/MultiDexIO.java
+++ b/src/main/java/lanchon/multidexlib2/MultiDexIO.java
@@ -15,10 +15,10 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
-import org.jf.dexlib2.iface.DexFile;
-import org.jf.dexlib2.iface.MultiDexContainer;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
+import com.android.tools.smali.dexlib2.iface.DexFile;
+import com.android.tools.smali.dexlib2.iface.MultiDexContainer;
 
 public class MultiDexIO {
 
diff --git a/src/main/java/lanchon/multidexlib2/OpcodeUtils.java b/src/main/java/lanchon/multidexlib2/OpcodeUtils.java
index bad19ec..e3b8b72 100644
--- a/src/main/java/lanchon/multidexlib2/OpcodeUtils.java
+++ b/src/main/java/lanchon/multidexlib2/OpcodeUtils.java
@@ -10,8 +10,8 @@
 
 package lanchon.multidexlib2;
 
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.VersionMap;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.VersionMap;
 
 public class OpcodeUtils {
 
diff --git a/src/main/java/lanchon/multidexlib2/RawDexIO.java b/src/main/java/lanchon/multidexlib2/RawDexIO.java
index 99247de..711abda 100644
--- a/src/main/java/lanchon/multidexlib2/RawDexIO.java
+++ b/src/main/java/lanchon/multidexlib2/RawDexIO.java
@@ -16,12 +16,12 @@
 
 import com.google.common.io.ByteStreamsHack;
 import com.google.common.io.Files;
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
-import org.jf.dexlib2.iface.DexFile;
-import org.jf.dexlib2.util.DexUtil;
-import org.jf.dexlib2.writer.io.DexDataStore;
-import org.jf.dexlib2.writer.io.FileDataStore;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
+import com.android.tools.smali.dexlib2.iface.DexFile;
+import com.android.tools.smali.dexlib2.util.DexUtil;
+import com.android.tools.smali.dexlib2.writer.io.DexDataStore;
+import com.android.tools.smali.dexlib2.writer.io.FileDataStore;
 
 public class RawDexIO {
 
diff --git a/src/main/java/lanchon/multidexlib2/SingletonDexContainer.java b/src/main/java/lanchon/multidexlib2/SingletonDexContainer.java
index 1b4e0b2..b402d0b 100644
--- a/src/main/java/lanchon/multidexlib2/SingletonDexContainer.java
+++ b/src/main/java/lanchon/multidexlib2/SingletonDexContainer.java
@@ -13,7 +13,7 @@
 import java.util.Collections;
 import java.util.Map;
 
-import org.jf.dexlib2.iface.DexFile;
+import com.android.tools.smali.dexlib2.iface.DexFile;
 
 public class SingletonDexContainer<T extends DexFile> extends AbstractMultiDexContainer<T> {
 
diff --git a/src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java b/src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java
index 312e1fd..c1bf3e4 100644
--- a/src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java
+++ b/src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java
@@ -19,8 +19,8 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.jf.dexlib2.Opcodes;
-import org.jf.dexlib2.dexbacked.DexBackedDexFile;
+import com.android.tools.smali.dexlib2.Opcodes;
+import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile;
 
 public class ZipFileDexContainer extends AbstractMultiDexContainer<DexBackedDexFile> {