implemented exclude filter policy (again)

Author: archinamon

android-gradle-aspectj/src/main/kotlin/com/archinamon/AspectJExtension.kt

@@ -6,6 +6,7 @@ open class AspectJExtension {
 
     open var includeAllJars = false
     open var includeJar = mutableSetOf<String>()
+    open var excludeJar = mutableSetOf<String>()
     open var extendClasspath = true
 
     open var includeAspectsFromJar = mutableSetOf<String>()
@@ -36,6 +37,11 @@ open class AspectJExtension {
         return this
     }
 
+    fun excludeJar(vararg filters: String): AspectJExtension {
+        excludeJar.addAll(filters)
+        return this
+    }
+
     fun includeAspectsFromJar(vararg filters: String): AspectJExtension {
         includeAspectsFromJar.addAll(filters)
         return this

android-gradle-aspectj/src/main/kotlin/com/archinamon/api/transform/AspectJTransform.kt

@@ -12,6 +12,7 @@ import com.archinamon.api.AspectJMergeJars
 import com.archinamon.api.AspectJWeaver
 import com.archinamon.plugin.ConfigScope
 import com.archinamon.utils.*
+import com.archinamon.utils.DependencyFilter.isExcludeFilterMatched
 import com.archinamon.utils.DependencyFilter.isIncludeFilterMatched
 import com.google.common.collect.Sets
 import org.aspectj.util.FileUtil
@@ -110,6 +111,7 @@ internal abstract class AspectJTransform(val project: Project, private val polic
 
         val outputProvider = transformInvocation.outputProvider
         val includeJars = config.aspectj().includeJar
+        val excludeJars = config.aspectj().excludeJar
         val includeAspects = config.aspectj().includeAspectsFromJar
 
         if (!transformInvocation.isIncremental) {
@@ -147,17 +149,26 @@ internal abstract class AspectJTransform(val project: Project, private val polic
                 aspectJWeaver.classPath shl jar.file
 
                 if (modeComplex()) {
-                    if (config.aspectj().includeAllJars || (includeJars.isNotEmpty() && isIncludeFilterMatched(jar.file, includeJars))) {
+                    val includeAllJars = config.aspectj().includeAllJars
+                    val includeFilterMatched = includeJars.isNotEmpty() && isIncludeFilterMatched(jar.file, includeJars)
+                    val excludeFilterMatched = excludeJars.isNotEmpty() && isExcludeFilterMatched(jar.file, excludeJars)
+
+                    if (excludeFilterMatched) {
+                        logJarInpathRemoved(jar)
+                    }
+
+                    if (!excludeFilterMatched && (includeAllJars || includeFilterMatched)) {
                         logJarInpathAdded(jar)
                         aspectJWeaver.inPath shl jar.file
                     } else {
                         copyJar(outputProvider, jar)
                     }
                 } else {
-                    if (includeJars.isNotEmpty()) logIgnoreInpathJars()
+                    if (includeJars.isNotEmpty() || excludeJars.isNotEmpty()) logIgnoreInpathJars()
                 }
 
-                if (includeAspects.isNotEmpty() && isIncludeFilterMatched(jar.file, includeAspects)) {
+                val includeAspectsFilterMatched = includeAspects.isNotEmpty() && isIncludeFilterMatched(jar.file, includeAspects)
+                if (includeAspectsFilterMatched) {
                     logJarAspectAdded(jar)
                     aspectJWeaver.aspectPath shl jar.file
                 }

android-gradle-aspectj/src/main/kotlin/com/archinamon/utils/DependencyFilter.kt

@@ -3,7 +3,7 @@ package com.archinamon.utils
 import java.io.File
 
 /**
- * TODO: Add description
+ * Jar/aar filter that able to search within gradle cache for asked package name in aar's manifests
  *
  * @author archinamon on 18/03/17.
  */
@@ -41,11 +41,10 @@ internal object DependencyFilter {
             return false
         }
 
-        val filterTmp = filter
         return when {
-            str.contains(filterTmp) -> true
-            filterTmp.contains("/") -> str.contains(filterTmp.replace("/", File.separator))
-            filterTmp.contains("\\") -> str.contains(filterTmp.replace("\\", File.separator))
+            str.contains(filter) -> true
+            filter.contains("/") -> str.contains(filter.replace("/", File.separator))
+            filter.contains("\\") -> str.contains(filter.replace("\\", File.separator))
             else -> false
         }
     }

android-gradle-aspectj/src/main/kotlin/com/archinamon/utils/StatusLogger.kt

@@ -37,13 +37,18 @@ internal fun logWeaverBuildPolicy(policy: BuildPolicy) {
 }
 
 internal fun logIgnoreInpathJars() {
-    println("Ignoring additional jars adding to -inpath in simple mode")
+    println("Ignoring include/exclude option of -inpath parameter in simple mode.\n" +
+            "Switch to `aspectj-ext` plugin to enable this behavior!")
 }
 
 internal fun logJarInpathAdded(jar: JarInput) {
     println("include jar :: ${jar.file.absolutePath}")
 }
 
+internal fun logJarInpathRemoved(jar: JarInput) {
+    println("exclude jar :: ${jar.file.absolutePath}")
+}
+
 internal fun logJarAspectAdded(jar: JarInput) {
     println("include aspects from :: ${jar.file.absolutePath}")
 }