Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to new smali repository (dexlib2 3.0.3) #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to new smali repository (dexlib2 3.0.3) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lanchon/multidexlib2/AbstractMultiDexContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/lanchon/multidexlib2/BasicDexEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/lanchon/multidexlib2/DexIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lanchon/multidexlib2/DirectoryDexContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/lanchon/multidexlib2/MultiDexContainerBackedDexFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/lanchon/multidexlib2/MultiDexIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lanchon/multidexlib2/OpcodeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/lanchon/multidexlib2/RawDexIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/lanchon/multidexlib2/SingletonDexContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/lanchon/multidexlib2/ZipFileDexContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

Expand Down