Merge pull request #71 from artyomd/development

version 0.4.1

Author: artyomd

.travis.yml

@@ -3,7 +3,7 @@ android:
         components:
                 - platform-tools
                 - build-tools-28.0.3
-                - android-28
+                - android-29
 script:
         - cd .buildscript/
         - ./before.sh

injector-android-example/app/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "app.artyomd.inject.example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }

injector-android-example/app/src/main/java/app/artyomd/injector/example/Application.java

@@ -1,21 +1,26 @@
 package app.artyomd.injector.example;
 
-import app.artyomd.injector.DexUtils;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import app.artyomd.injector.DexUtils;
+
 public class Application extends android.app.Application {
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		File dexPath = new File(getFilesDir() + "/dex", "lottie.zip");
+		File dexPath = new File(getFilesDir() + "/dex", "inject.zip");
 		if (!dexPath.exists()) {
-			DexUtils.prepareDex(getApplicationContext(), dexPath, "lottie.zip");
+			DexUtils.prepareDex(getApplicationContext(), dexPath, "inject.zip");
 		}
 		List<File> dexs = new ArrayList<>();
 		dexs.add(dexPath);
-		DexUtils.loadDex(getApplicationContext(), dexs);
+		try {
+			DexUtils.loadDex(getApplicationContext(), dexs);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 }
+

injector-android-example/lib/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
 apply plugin: 'app.artyomd.injector'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
     }
     lintOptions {
         abortOnError false
@@ -22,7 +22,5 @@ dependencies {
 }
 injectConfig {
     enabled = true
-    groups = [
-            "lottie": ["com.airbnb.android"]
-    ]
+    forceExcludeGroups = ["com.squareup.okio"]
 }

…d-example/lib/src/main/assets/lottie.zip …d-example/lib/src/main/assets/inject.zipinjector-android-example/lib/src/main/assets/lottie.zip renamed to injector-android-example/lib/src/main/assets/inject.zip injector-android-example/lib/src/main/assets/lottie.zip renamed to injector-android-example/lib/src/main/assets/inject.zip

@@ -23,10 +23,10 @@ repositories {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 29
     }
 }
 

injector-android/build.gradle

@@ -9,6 +9,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 public class DexUtils {
@@ -21,13 +22,11 @@ public class DexUtils {
 	 * @param context context
 	 * @param list    list with dex files
 	 */
-	public static void loadDex(Context context, List<File> list) {
-		try {
-			File optimizedDir = context.getDir("outdex", Context.MODE_PRIVATE);
-			DexInjector.installSecondaryDexes(context.getClassLoader(), optimizedDir, list);
-		} catch (Exception ex) {
-			Log.e(TAG, ex.toString());
-		}
+	public static void loadDex(Context context, List<File> list) throws IllegalAccessException,
+			IOException, InstantiationException, ClassNotFoundException, NoSuchMethodException,
+			InvocationTargetException, NoSuchFieldException {
+		File optimizedDir = context.getDir("outdex", Context.MODE_PRIVATE);
+		DexInjector.installSecondaryDexes(context.getClassLoader(), optimizedDir, list);
 	}
 
 	/**

injector-android/src/main/java/app/artyomd/injector/DexUtils.java

@@ -10,8 +10,7 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.DependencyResolutionListener;
-import org.gradle.api.artifacts.ResolvableDependencies;
+import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ResolvedArtifact;
 import org.gradle.api.tasks.TaskProvider;
 import org.jetbrains.annotations.NotNull;
@@ -32,12 +31,13 @@ public class InjectorPlugin implements Plugin<Project> {
 	private Set<AndroidArchiveLibrary> aars;
 
 	@Override
-	public void apply(@NotNull Project project) {
-		this.project = project;
+	public void apply(@NotNull Project target) {
+		this.project = target;
 		createExtension();
 		createConfiguration();
 		createExtractAARsTask();
-		project.afterEvaluate(project1 -> {
+		target.afterEvaluate(project1 -> {
+			System.out.println("After evaluate");
 			resolveArtifacts();
 			if (jars.isEmpty() && aars.isEmpty()) {
 				return;
@@ -63,24 +63,6 @@ private void createConfiguration() {
 		injectConf = project.getConfigurations().create("inject");
 		injectConf.setVisible(false);
 		injectConf.setTransitive(true);
-		project.getGradle().addListener(new DependencyResolutionListener() {
-			@Override
-			public void beforeResolve(@NotNull ResolvableDependencies dependencies) {
-				injectConf.getDependencies().forEach(dependency -> {
-					if (extension.checkGroup(dependency.getGroup()) && extension.checkName(dependency.getName())) {
-						project.getDependencies().add("compileOnly", dependency);
-					} else if (!extension.checkForceExcluded(dependency)) {
-						project.getDependencies().add("implementation", dependency);
-					}
-				});
-				project.getGradle().removeListener(this);
-			}
-
-			@Override
-			public void afterResolve(@NotNull ResolvableDependencies dependencies) {
-				//Nothing to do
-			}
-		});
 	}
 
 	private void createExtractAARsTask() {
@@ -91,14 +73,29 @@ private void createExtractAARsTask() {
 	private void resolveArtifacts() {
 		Set<ResolvedArtifact> jars = new HashSet<>();
 		Set<AndroidArchiveLibrary> aars = new HashSet<>();
+
 		injectConf.getResolvedConfiguration().getResolvedArtifacts().forEach(resolvedArtifact -> {
-			if (extension.checkArtifact(resolvedArtifact) && !extension.checkForceExcluded(resolvedArtifact)) {
+			Dependency dependency = Utils.createDependencyFrom(resolvedArtifact);
+			if (!extension.isExcluded(resolvedArtifact) && !extension.isForceExcluded(resolvedArtifact)) {
 				System.out.println("inject-->[injection detected][" + resolvedArtifact.getType() + ']' + resolvedArtifact.getModuleVersion().getId());
 				if ("jar".equals(resolvedArtifact.getType())) {
 					jars.add(resolvedArtifact);
 				} else if ("aar".equals(resolvedArtifact.getType())) {
 					aars.add(new AndroidArchiveLibrary(project, resolvedArtifact));
 				}
+
+				System.out.println("compileOnly:" + resolvedArtifact.getName());
+				project.getDependencies().add("compileOnly", dependency);
+			} else {
+				System.out.println("inject-->[injection skipped][" + resolvedArtifact.getType() + ']' + resolvedArtifact.getModuleVersion().getId());
+
+				if (extension.isForceExcluded(dependency)) {
+					System.out.println("implementation:" + dependency.getName());
+					project.getDependencies().add("implementation", dependency);
+				} else {
+					System.out.println("compileOnly:" + resolvedArtifact.getName());
+					project.getDependencies().add("compileOnly", dependency);
+				}
 			}
 		});
 		this.jars = Collections.unmodifiableSet(jars);

injector/src/main/java/app/artyomd/injector/InjectorPlugin.java

@@ -21,7 +21,11 @@
 
 import javax.annotation.Nonnull;
 import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -38,8 +42,8 @@ class VariantProcessor {
 	private JavaVersion sourceCompatibilityVersion;
 	private JavaVersion targetCompatibilityVersion;
 
-	private Set<AndroidArchiveLibrary> androidArchiveLibraries;
-	private Set<ResolvedArtifact> jarFiles;
+	private Set<? extends AndroidArchiveLibrary> androidArchiveLibraries;
+	private Set<? extends ResolvedArtifact> jarFiles;
 
 	private String variantName;
 	private String projectPackageName;
@@ -51,18 +55,19 @@ class VariantProcessor {
 		this.variantName = variant.getName();
 		this.variantName = variantName.substring(0, 1).toUpperCase() + variantName.substring(1);
 		try {
-			projectPackageName = new XmlSlurper().parse(androidExtension.getSourceSets().getByName("main").getManifest().getSrcFile()).getProperty("@package").toString();
+			projectPackageName = new XmlSlurper().parse(androidExtension.getSourceSets().getByName("main").getManifest()
+					.getSrcFile()).getProperty("@package").toString();
 		} catch (IOException | SAXException | ParserConfigurationException e) {
 			e.printStackTrace();
 		}
 	}
 
-	public void setAndroidArchiveLibraries(Set<AndroidArchiveLibrary> androidArchiveLibraries) {
-		this.androidArchiveLibraries = androidArchiveLibraries;
+	public void setAndroidArchiveLibraries(Set<? extends AndroidArchiveLibrary> androidArchiveLibraries) {
+		this.androidArchiveLibraries = new HashSet<>(androidArchiveLibraries);
 	}
 
-	public void setJarFiles(Set<ResolvedArtifact> jarFiles) {
-		this.jarFiles = jarFiles;
+	public void setJarFiles(Set<? extends ResolvedArtifact> jarFiles) {
+		this.jarFiles = new HashSet<>(jarFiles);
 	}
 
 	public void processVariant(InjectorExtension extension) {
@@ -219,9 +224,9 @@ private void createDexTask(InjectorExtension extension) {
 				sourceCompatibilityVersion, targetCompatibilityVersion);
 
 		taskProvider.configure(createInjectDexes -> {
-			TaskProvider extractAARsTask = project.getTasks().named(InjectorPlugin.EXTRACT_AARS_TASK_NAME);
-			TaskProvider assembleTask = project.getTasks().named("assemble" + variantName);
-			TaskProvider rGenerationTask = project.getTasks().named("generate" + variantName + "RFile");
+			TaskProvider<?> extractAARsTask = project.getTasks().named(InjectorPlugin.EXTRACT_AARS_TASK_NAME);
+			TaskProvider<?> assembleTask = project.getTasks().named("assemble" + variantName);
+			TaskProvider<?> rGenerationTask = project.getTasks().named("generate" + variantName + "RFile");
 			createInjectDexes.dependsOn(extractAARsTask);
 			createInjectDexes.dependsOn(rGenerationTask);
 			createInjectDexes.dependsOn(assembleTask);

injector/src/main/java/app/artyomd/injector/VariantProcessor.java

@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Map;
 
-@SuppressWarnings({"unused"})
+@SuppressWarnings("unused")
 public class InjectorExtension {
 	private boolean enabled = true;
 	private List<String> defaultExcludeGroups = new ArrayList<>();
@@ -19,7 +19,7 @@ public class InjectorExtension {
 	private List<String> forceExcludeNames = new ArrayList<>();
 	private List<String> forceExcludeGroups = new ArrayList<>();
 	private String dexLocation = "/outputs/inject/";
-	private String defaultDexName = "inject.dex";
+	private String defaultDexName = "inject";
 	private Map<String, List<String>> groups = new HashMap<>();
 
 	public InjectorExtension() {
@@ -49,69 +49,65 @@ public void setDexLocation(String dexLocation) {
 	}
 
 	public void setExcludeGroups(List<String> excludeGroups) {
-		this.excludeGroups = excludeGroups;
+		this.excludeGroups = new ArrayList<>(excludeGroups);
 	}
 
 	public void setExcludeNames(List<String> excludeNames) {
-		this.excludeNames = excludeNames;
+		this.excludeNames = new ArrayList<>(excludeNames);
 	}
 
 	public void setForceExcludeNames(List<String> forceExcludeNames) {
-		this.forceExcludeNames = forceExcludeNames;
+		this.forceExcludeNames = new ArrayList<>(forceExcludeNames);
 	}
 
 	public void setForceExcludeGroups(List<String> forceExcludeGroups) {
-		this.forceExcludeGroups = forceExcludeGroups;
+		this.forceExcludeGroups = new ArrayList<>(forceExcludeGroups);
 	}
 
 	public void setDefaultDexName(String defaultDexName) {
 		this.defaultDexName = defaultDexName;
 	}
 
-	public void setGroups(Map<String, List<String>> groups) {
-		this.groups = groups;
+	public void setGroups(Map<String, ? extends List<String>> groups) {
+		this.groups = new HashMap<>(groups);
 	}
 
-	public boolean checkArtifact(ResolvedArtifact artifact) {
+	public boolean isExcluded(ResolvedArtifact artifact) {
 		ModuleVersionIdentifier id = artifact.getModuleVersion().getId();
-		return checkGroup(id.getGroup()) && checkName(id.getName());
+		return isGroupExcluded(id.getGroup()) || isNameExcluded(id.getName());
 	}
 
-	public boolean checkForceExcluded(ResolvedArtifact artifact) {
+	public boolean isExcluded(Dependency dependency) {
+		return isGroupExcluded(dependency.getGroup()) || isNameExcluded(dependency.getName());
+	}
+
+	private boolean isNameExcluded(String name) {
+		return Utils.listContainsMatcher(name, excludeNames);
+	}
+
+	private boolean isGroupExcluded(String group) {
+		return group != null && (Utils.listContainsMatcher(group, defaultExcludeGroups)
+				|| Utils.listContainsMatcher(group, excludeGroups));
+	}
+
+	public boolean isForceExcluded(ResolvedArtifact artifact) {
 		ModuleVersionIdentifier id = artifact.getModuleVersion().getId();
-		String name = id.getName();
-		String group = id.getGroup();
-		return Utils.listContainsMatcher(name, forceExcludeNames) || Utils.listContainsMatcher(group, forceExcludeGroups);
+		return isGroupForceExcluded(id.getGroup()) || isNameForceExcluded(id.getName());
 	}
 
-	public boolean checkForceExcluded(Dependency dependency) {
-		String name = dependency.getName();
-		for (String excludeName : forceExcludeNames) {
-			if (name.matches(excludeName)) {
-				return true;
-			}
-		}
-		String group = dependency.getGroup();
-		if (group != null) {
-			for (String excludeName : forceExcludeGroups) {
-				if (group.matches(excludeName)) {
-					return true;
-				}
-			}
-		}
-		return false;
+	public boolean isForceExcluded(Dependency dependency) {
+		return isGroupForceExcluded(dependency.getGroup()) || isNameForceExcluded(dependency.getName());
 	}
 
-	public boolean checkName(String name) {
-		return !Utils.listContainsMatcher(name, excludeNames);
+	private boolean isNameForceExcluded(String name) {
+		return Utils.listContainsMatcher(name, forceExcludeNames);
 	}
 
-	public boolean checkGroup(String group) {
-		return !Utils.listContainsMatcher(group, defaultExcludeGroups)
-				&& !Utils.listContainsMatcher(group, excludeGroups);
+	private boolean isGroupForceExcluded(String group) {
+		return group != null && Utils.listContainsMatcher(group, forceExcludeGroups);
 	}
 
-	public Map<String, List<ResolvedArtifact>> getDexes(List<ResolvedArtifact> artifacts) {
+	public Map<String, List<ResolvedArtifact>> getDexes(List<? extends ResolvedArtifact> artifacts) {
 		Map<String, List<ResolvedArtifact>> dexMap = new HashMap<>();
 		artifacts.forEach(resolvedArtifact -> {
 			List<String> names = getDexName(resolvedArtifact);