Merge pull request #43 from Badya/master

Archinamon · web-flow · commit a3be577fb4e1 · 2017-04-12T11:42:00.000+03:00
Improvements to plugin lifecycle #42
diff --git a/AspectJ-gradle/build.gradle b/AspectJ-gradle/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 }
 
 group = 'com.archinamon'
-version = '3.0.0'
+version = '3.0.1'
 
 // local archive :: debug mode
 uploadArchives {
diff --git a/AspectJ-gradle/src/main/kotlin/com/archinamon/AspectJExtension.kt b/AspectJ-gradle/src/main/kotlin/com/archinamon/AspectJExtension.kt
@@ -5,10 +5,10 @@ open class AspectJExtension {
     open var ajc = "1.8.10"
 
     open var includeAllJars = false
-    open var includeJar = mutableListOf<String>()
+    open var includeJar = mutableSetOf<String>()
 
-    open var includeAspectsFromJar = mutableListOf<String>()
-    open var ajcArgs = mutableListOf<String>()
+    open var includeAspectsFromJar = mutableSetOf<String>()
+    open var ajcArgs = mutableSetOf<String>()
 
     open var weaveInfo = true
     open var debugInfo = false
diff --git a/AspectJ-gradle/src/main/kotlin/com/archinamon/api/AspectJCompileTask.kt b/AspectJ-gradle/src/main/kotlin/com/archinamon/api/AspectJCompileTask.kt
@@ -68,7 +68,6 @@ internal open class AspectJCompileTask: AbstractCompile() {
 
             task.source(sources)
             task.classpath = classpath()
-
             findCompiledAspectsInClasspath(task, config.includeAspectsFromJar)
 
             task.aspectJWeaver.ajSources = sources
@@ -94,6 +93,7 @@ internal open class AspectJCompileTask: AbstractCompile() {
             // javaCompile.classpath does not contain exploded-aar/**/jars/*.jars till first run
             javaCompiler.doLast {
                 task.classpath = classpath()
+                findCompiledAspectsInClasspath(task, config.includeAspectsFromJar)
             }
 
             //apply behavior
@@ -104,9 +104,9 @@ internal open class AspectJCompileTask: AbstractCompile() {
             return SimpleFileCollection(javaCompiler.classpath.files + javaCompiler.destinationDir)
         }
 
-        private fun findCompiledAspectsInClasspath(task: AspectJCompileTask, aspectsFromJar: List<String>) {
+        private fun findCompiledAspectsInClasspath(task: AspectJCompileTask, aspectsFromJar: Collection<String>) {
             val classpath: FileCollection = task.classpath
-            val aspects: ArrayList<File> = ArrayList()
+            val aspects: MutableSet<File> = mutableSetOf()
 
             classpath.forEach { file ->
                 if (aspectsFromJar.isNotEmpty() && DependencyFilter.isIncludeFilterMatched(file, aspectsFromJar)) {
@@ -127,9 +127,9 @@ internal open class AspectJCompileTask: AbstractCompile() {
 
         destinationDir.deleteRecursively()
 
-        aspectJWeaver.classPath = ArrayList(classpath.files)
+        aspectJWeaver.classPath = LinkedHashSet(classpath.files)
         aspectJWeaver.doWeave()
 
         logCompilationFinish()
     }
-}
+}
diff --git a/AspectJ-gradle/src/main/kotlin/com/archinamon/api/AspectJWeaver.kt b/AspectJ-gradle/src/main/kotlin/com/archinamon/api/AspectJWeaver.kt
@@ -39,17 +39,16 @@ internal class AspectJWeaver(val project: Project) {
     var breakOnError: Boolean = false
     var experimental: Boolean = false
 
-    var ajcArgs = ArrayList<String>()
+    var ajcArgs = LinkedHashSet<String>()
 
-    var ajSources: ArrayList<File> = ArrayList()
+    var ajSources: MutableSet<File> = LinkedHashSet()
         internal set(ajSources) {
-            ajSources.filterNot { this.ajSources.contains(it) }
-                .forEach { this.ajSources.add(it) }
+            ajSources.forEach { this.ajSources.add(it) }
         }
 
-    var aspectPath: ArrayList<File> = ArrayList()
-    var inPath: ArrayList<File> = ArrayList()
-    var classPath: ArrayList<File> = ArrayList()
+    var aspectPath: MutableSet<File> = LinkedHashSet()
+    var inPath: MutableSet<File> = LinkedHashSet()
+    var classPath: MutableSet<File> = LinkedHashSet()
     var bootClasspath: String? = null
     var sourceCompatibility: String? = null
     var targetCompatibility: String? = null
@@ -168,7 +167,7 @@ internal class AspectJWeaver(val project: Project) {
         }
     }
 
-    private inline operator fun <reified E> MutableList<in E>.plus(elem: E): MutableList<in E> {
+    private inline operator fun <reified E> MutableCollection<in E>.plus(elem: E): MutableCollection<in E> {
         this.add(elem)
         return this
     }
diff --git a/AspectJ-gradle/src/main/kotlin/com/archinamon/plugin/PluginSetup.kt b/AspectJ-gradle/src/main/kotlin/com/archinamon/plugin/PluginSetup.kt
@@ -1,7 +1,6 @@
 package com.archinamon.plugin
 
 import com.android.build.gradle.AppPlugin
-import com.android.build.gradle.BasePlugin
 import com.android.build.gradle.LibraryPlugin
 import com.archinamon.AndroidConfig
 import com.archinamon.AspectJExtension
diff --git a/AspectJ-gradle/src/main/kotlin/com/archinamon/utils/AarExploring.kt b/AspectJ-gradle/src/main/kotlin/com/archinamon/utils/AarExploring.kt
@@ -12,7 +12,7 @@ internal fun findPackageNameIfAar(input: File): String {
 
     do {
         f = f?.parentFile
-    } while (f?.isDirectory!! && !f.listFiles()?.any(::findManifest)!!)
+    } while (f?.isDirectory!! && !f.listFiles().any(::findManifest))
 
     val manifest = f.listFiles().find(::findManifest)
     if (manifest != null) {
diff --git a/AspectJ-gradle/src/main/kotlin/com/archinamon/utils/DependencyFilter.kt b/AspectJ-gradle/src/main/kotlin/com/archinamon/utils/DependencyFilter.kt
@@ -15,15 +15,15 @@ internal object DependencyFilter {
         EXCLUDE
     }
 
-    internal fun isExcludeFilterMatched(file: File?, filters: List<String>?): Boolean {
+    internal fun isExcludeFilterMatched(file: File?, filters: Collection<String>?): Boolean {
         return isFilterMatched(file, filters, Policy.EXCLUDE)
     }
 
-    internal fun isIncludeFilterMatched(file: File?, filters: List<String>?): Boolean {
+    internal fun isIncludeFilterMatched(file: File?, filters: Collection<String>?): Boolean {
         return isFilterMatched(file, filters, Policy.INCLUDE)
     }
 
-    private fun isFilterMatched(file: File?, filters: List<String>?, filterPolicy: Policy): Boolean {
+    private fun isFilterMatched(file: File?, filters: Collection<String>?, filterPolicy: Policy): Boolean {
         if (file === null) {
             return false
         }
diff --git a/AspectJ-gradle/src/main/kotlin/com/archinamon/utils/StatusLogger.kt b/AspectJ-gradle/src/main/kotlin/com/archinamon/utils/StatusLogger.kt
@@ -52,7 +52,7 @@ internal fun logExtraAjcArgumentAlreadyExists(arg: String) {
     println("extra AjC argument $arg already exists in build config")
 }
 
-internal fun logBuildParametersAdapted(args: MutableList<String?>, logfile: String) {
+internal fun logBuildParametersAdapted(args: MutableCollection<String?>, logfile: String) {
     var params: String = ""
 
     args.forEach { params += if (it?.startsWith('-')!!) "$it :: " else ( if (it.length > 200) "[ list files ],\n" else "$it, ") }
diff --git a/AspectJ-gradle/src/main/kotlin/com/archinamon/utils/VariantUtils.kt b/AspectJ-gradle/src/main/kotlin/com/archinamon/utils/VariantUtils.kt
@@ -8,7 +8,6 @@ import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.file.collections.SimpleFileCollection
 import org.gradle.api.tasks.compile.JavaCompile
 import java.io.File
-import java.util.ArrayList
 
 fun getJavaTask(baseVariantData: BaseVariantData<out BaseVariantOutputData>): JavaCompile? {
     if (baseVariantData.javacTask != null) {
@@ -36,8 +35,8 @@ fun getAjSourceAndExcludeFromJavac(project: Project, variantData: BaseVariantDat
     return aspects.filter(File::exists)
 }
 
-fun findAjSourcesForVariant(project: Project, variantName: String): ArrayList<File> {
-    val possibleDirs: MutableList<File> = mutableListOf()
+fun findAjSourcesForVariant(project: Project, variantName: String): MutableSet<File> {
+    val possibleDirs: MutableSet<File> = mutableSetOf()
     if (project.file("src/main/aspectj").exists()) {
         possibleDirs.add(project.file("src/main/aspectj"))
     }
@@ -47,25 +46,24 @@ fun findAjSourcesForVariant(project: Project, variantName: String): ArrayList<Fi
     root.forEach { file ->
         types.forEach { type ->
             if (file.name.contains(type.toLowerCase()) &&
-                    file.list().any { it.contains("aspectj") } &&
-                    !possibleDirs.contains(file)) {
+                    file.list().any { it.contains("aspectj") }) {
                 possibleDirs.add(File(file, "aspectj"))
             }
         }
     }
 
-    return ArrayList(possibleDirs)
+    return LinkedHashSet(possibleDirs)
 }
 
 fun getVariantDataList(plugin: BasePlugin): List<BaseVariantData<out BaseVariantOutputData>> {
     return plugin.variantManager.variantDataList
 }
 
-internal infix fun <E> ArrayList<in E>.shl(elem: E): ArrayList<in E> {
+internal infix fun <E> MutableCollection<in E>.shl(elem: E): MutableCollection<in E> {
     this.add(elem)
     return this
 }
 
-internal infix fun <E> ArrayList<in E>.from(elems: List<E>) {
+internal infix fun <E> MutableCollection<in E>.from(elems: Collection<E>) {
     this.addAll(elems)
 }
diff --git a/AspectJ-gradle/src/test/kotlin/com/archinamon/utils/AarExploringTest.kt b/AspectJ-gradle/src/test/kotlin/com/archinamon/utils/AarExploringTest.kt
@@ -0,0 +1,18 @@
+package com.archinamon.utils
+
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+import java.io.File
+
+class AarExploringTest {
+    @Rule
+    @JvmField
+    val folder = TemporaryFolder()
+
+    @Test
+    fun noNPEIfFileNotExist() {
+        findPackageNameIfAar(File("/build-cache/this/file/not/exist"))
+    }
+
+}
diff --git a/README.md b/README.md
@@ -88,8 +88,10 @@ Tune extension
 aspectj {
     ajc '1.8.10'
 
+    /* @see Ext plugin config **/
     includeAllJars false
     includeJar 'design', 'support-v4', 'dagger'
+
     includeAspectsFromJar 'my-aj-logger-lib', 'any-other-libs-with-aspects'
     ajcArgs << '-referenceInfo' << '-warn:deprecation'
 
@@ -129,18 +131,19 @@ So no need to define them manually.
 - `transformLogFile` Defines name for the log file where all Aj compiler info writes to, new separated for Transformer
 - `compilationLogFile` Defines name for the log file where all Aj compiler info writes to, new separated for CompileTask
 
-Working with `includeJar` parameter
--------
-Now this option requires some workaround to avoid `Multiple dex files exception`.
-As well as `includeAllJars` parameter too :)
-
-If you wanna weave any jars as inpath parameter, use instead another plugin config:
+Ext plugin config
+-----------------
 ```groovy
 apply plugin: 'com.archinamon.aspectj-ext'
 ```
 
-And you should switch off InstantRun option. Plugin detects IR status and fails build if IR will be found.
-In future this hack won't be needed I hope.
+Ext config:
+- allows usage of `includeJar` and `includeAllJars` parameters, with workaround to avoid `Multiple dex files exception`
+- supports `multiDex`
+- supports `Instrumented tests`
+
+Currently it has some limitations:
+- `InstantRun` must be switched off (Plugin detects IR status and fails build if IR will be found).
 
 Working tests
 -------

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ dependencies {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`group = 'com.archinamon'`
`38`		`-version = '3.0.0'`
	`38`	`+version = '3.0.1'`
`39`	`39`
`40`	`40`	`// local archive :: debug mode`
`41`	`41`	`uploadArchives {`
Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@ internal object DependencyFilter {`
`15`	`15`	`EXCLUDE`
`16`	`16`	`}`
`17`	`17`
`18`		`- internal fun isExcludeFilterMatched(file: File?, filters: List<String>?): Boolean {`
	`18`	`+ internal fun isExcludeFilterMatched(file: File?, filters: Collection<String>?): Boolean {`
`19`	`19`	`return isFilterMatched(file, filters, Policy.EXCLUDE)`
`20`	`20`	`}`
`21`	`21`
`22`		`- internal fun isIncludeFilterMatched(file: File?, filters: List<String>?): Boolean {`
	`22`	`+ internal fun isIncludeFilterMatched(file: File?, filters: Collection<String>?): Boolean {`
`23`	`23`	`return isFilterMatched(file, filters, Policy.INCLUDE)`
`24`	`24`	`}`
`25`	`25`
`26`		`- private fun isFilterMatched(file: File?, filters: List<String>?, filterPolicy: Policy): Boolean {`
	`26`	`+ private fun isFilterMatched(file: File?, filters: Collection<String>?, filterPolicy: Policy): Boolean {`
`27`	`27`	`if (file === null) {`
`28`	`28`	`return false`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ internal fun logExtraAjcArgumentAlreadyExists(arg: String) {`
`52`	`52`	`println("extra AjC argument $arg already exists in build config")`
`53`	`53`	`}`
`54`	`54`
`55`		`-internal fun logBuildParametersAdapted(args: MutableList<String?>, logfile: String) {`
	`55`	`+internal fun logBuildParametersAdapted(args: MutableCollection<String?>, logfile: String) {`
`56`	`56`	`var params: String = ""`
`57`	`57`
`58`	`58`	`args.forEach { params += if (it?.startsWith('-')!!) "$it :: " else ( if (it.length > 200) "[ list files ],\n" else "$it, ") }`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import org.gradle.api.file.FileCollection`
`8`	`8`	`import org.gradle.api.internal.file.collections.SimpleFileCollection`
`9`	`9`	`import org.gradle.api.tasks.compile.JavaCompile`
`10`	`10`	`import java.io.File`
`11`		`-import java.util.ArrayList`
`12`	`11`
`13`	`12`	`fun getJavaTask(baseVariantData: BaseVariantData<out BaseVariantOutputData>): JavaCompile? {`
`14`	`13`	`if (baseVariantData.javacTask != null) {`
`@@ -36,8 +35,8 @@ fun getAjSourceAndExcludeFromJavac(project: Project, variantData: BaseVariantDat`
`36`	`35`	`return aspects.filter(File::exists)`
`37`	`36`	`}`
`38`	`37`
`39`		`-fun findAjSourcesForVariant(project: Project, variantName: String): ArrayList<File> {`
`40`		`- val possibleDirs: MutableList<File> = mutableListOf()`
	`38`	`+fun findAjSourcesForVariant(project: Project, variantName: String): MutableSet<File> {`
	`39`	`+ val possibleDirs: MutableSet<File> = mutableSetOf()`
`41`	`40`	`if (project.file("src/main/aspectj").exists()) {`
`42`	`41`	`possibleDirs.add(project.file("src/main/aspectj"))`
`43`	`42`	`}`
`@@ -47,25 +46,24 @@ fun findAjSourcesForVariant(project: Project, variantName: String): ArrayList<Fi`
`47`	`46`	`root.forEach { file ->`
`48`	`47`	`types.forEach { type ->`
`49`	`48`	`if (file.name.contains(type.toLowerCase()) &&`
`50`		`- file.list().any { it.contains("aspectj") } &&`
`51`		`- !possibleDirs.contains(file)) {`
	`49`	`+ file.list().any { it.contains("aspectj") }) {`
`52`	`50`	`possibleDirs.add(File(file, "aspectj"))`
`53`	`51`	`}`
`54`	`52`	`}`
`55`	`53`	`}`
`56`	`54`
`57`		`- return ArrayList(possibleDirs)`
	`55`	`+ return LinkedHashSet(possibleDirs)`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`fun getVariantDataList(plugin: BasePlugin): List<BaseVariantData<out BaseVariantOutputData>> {`
`61`	`59`	`return plugin.variantManager.variantDataList`
`62`	`60`	`}`
`63`	`61`
`64`		`-internal infix fun <E> ArrayList<in E>.shl(elem: E): ArrayList<in E> {`
	`62`	`+internal infix fun <E> MutableCollection<in E>.shl(elem: E): MutableCollection<in E> {`
`65`	`63`	`this.add(elem)`
`66`	`64`	`return this`
`67`	`65`	`}`
`68`	`66`
`69`		`-internal infix fun <E> ArrayList<in E>.from(elems: List<E>) {`
	`67`	`+internal infix fun <E> MutableCollection<in E>.from(elems: Collection<E>) {`
`70`	`68`	`this.addAll(elems)`
`71`	`69`	`}`