Merge pull request #64 from artyomd/development

Version 0.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Apr 19 21:51:18 AMT 2019
+#Mon May 13 23:41:32 AMT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

injector-android-example/build.gradle

@@ -9,11 +9,20 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.4.0"
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "app.artyomd.injector:injector:${VERSION_NAME}"
     }
 }
 
+plugins {
+    id 'com.gradle.build-scan' version '2.3'
+}
+
+buildScan {
+    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+    termsOfServiceAgree = 'yes'
+}
+
 allprojects {
     repositories {
         google()

injector-android-example/lib/build.gradle

@@ -18,7 +18,7 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    inject 'com.airbnb.android:lottie:3.0.1'
+    inject 'com.airbnb.android:lottie:3.0.3'
 }
 injectConfig {
     enabled = true

injector-android/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 

injector/build.gradle

@@ -7,6 +7,7 @@ plugins {
 apply from: '../versions.gradle'
 
 sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 repositories {
     google()
@@ -19,7 +20,7 @@ dependencies {
     compile 'com.squareup:javapoet:1.11.1'
     //compile 'com.github.javaparser:javaparser-core:3.13.6'
     compile 'commons-io:commons-io:2.6'
-    compile 'com.android.tools.build:gradle:3.4.0'
+    compile 'com.android.tools.build:gradle:3.4.1'
 }
 
 def checkSigning() {

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

@@ -1,26 +1,24 @@
 package app.artyomd.injector;
 
+import app.artyomd.injector.extension.InjectorExtension;
+import app.artyomd.injector.model.AndroidArchiveLibrary;
+import app.artyomd.injector.task.ExtractAarTask;
+import app.artyomd.injector.util.Utils;
 import com.android.build.gradle.AppExtension;
 import com.android.build.gradle.LibraryExtension;
 import com.android.build.gradle.api.BaseVariant;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.DependencyResolutionListener;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.ResolvableDependencies;
 import org.gradle.api.artifacts.ResolvedArtifact;
+import org.gradle.api.tasks.TaskProvider;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
-import java.util.function.Consumer;
 
 public class InjectorPlugin implements Plugin<Project> {
 
@@ -33,44 +31,20 @@ public class InjectorPlugin implements Plugin<Project> {
 	private Set<ResolvedArtifact> jars;
 	private Set<AndroidArchiveLibrary> aars;
 
-	private static void removeOldVersions(Set<? extends ResolvedArtifact> artifactsList) {
-		Map<String, Map<String, ResolvedArtifact>> artifacts = new HashMap<>();
-		for (ResolvedArtifact artifact : artifactsList) {
-			ModuleVersionIdentifier id = artifact.getModuleVersion().getId();
-			String name = id.getName();
-			String group = id.getGroup();
-			String version = id.getVersion();
-			if (artifacts.containsKey(group)) {
-				Map<String, ResolvedArtifact> names = artifacts.get(group);
-				if (names.containsKey(name)) {
-					ResolvedArtifact old = names.get(name);
-					if (Utils.cmp(old.getModuleVersion().getId().getVersion(), version)) {
-						names.put(name, artifact);
-						artifactsList.remove(old);
-					} else {
-						artifactsList.remove(artifact);
-					}
-				} else {
-					names.put(name, artifact);
-				}
-			} else {
-				Map<String, ResolvedArtifact> names = new HashMap<>();
-				names.put(name, artifact);
-				artifacts.put(group, names);
-			}
-		}
-	}
-
 	@Override
 	public void apply(@NotNull Project project) {
 		this.project = project;
-		extension = project.getExtensions().create("injectConfig", InjectorExtension.class);
+		createExtension();
 		createConfiguration();
+		createExtractAARsTask();
 		project.afterEvaluate(project1 -> {
 			resolveArtifacts();
-			removeOldVersions(jars);
-			removeOldVersions(aars);
-			createExtractAARsTask();
+			if (jars.isEmpty() && aars.isEmpty()) {
+				return;
+			}
+			Utils.removeOldArtifacts(jars);
+			Utils.removeOldArtifacts(aars);
+
 			Object extension = project1.getExtensions().getByName("android");
 			if (extension instanceof LibraryExtension) {
 				((LibraryExtension) extension).getLibraryVariants().all(this::processVariant);
@@ -80,19 +54,9 @@ public void apply(@NotNull Project project) {
 		});
 	}
 
-	private void createExtractAARsTask() {
-		Task extractAars = project.getTasks().create(EXTRACT_AARS_TASK_NAME, Task.class);
-		extractAars.doFirst(task -> aars.forEach((Consumer<ResolvedArtifact>) resolvedArtifact -> {
-			String extractedAarPath = ((AndroidArchiveLibrary) resolvedArtifact).getRootFolder().getAbsolutePath();
-			File extractedAar = new File(extractedAarPath);
-			if (!extractedAar.exists()) {
-				try {
-					Utils.unzip(resolvedArtifact.getFile(), extractedAarPath);
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}));
+	private void createExtension() {
+		extension = new InjectorExtension();
+		project.getExtensions().add(InjectorExtension.class, "injectConfig", extension);
 	}
 
 	private void createConfiguration() {
@@ -119,6 +83,11 @@ public void afterResolve(@NotNull ResolvableDependencies dependencies) {
 		});
 	}
 
+	private void createExtractAARsTask() {
+		TaskProvider<ExtractAarTask> extractAarTaskTaskProvider = project.getTasks().register(EXTRACT_AARS_TASK_NAME, ExtractAarTask.class);
+		extractAarTaskTaskProvider.configure(extractAarTask -> extractAarTask.setAndroidArchiveLibraries(aars));
+	}
+
 	private void resolveArtifacts() {
 		Set<ResolvedArtifact> jars = new HashSet<>();
 		Set<AndroidArchiveLibrary> aars = new HashSet<>();