Merge pull request #46 from Archinamon/patch-improvements

Small improvements

Author: Archinamon

AspectJ-gradle/build.gradle

@@ -31,11 +31,12 @@ dependencies {
     compile "org.aspectj:aspectjtools:$aspectjVersion"
 
     testCompile 'junit:junit:4.10'
-    testCompile 'org.easytesting:fest-assert-core:2.0M10'
+    testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 }
 
 group = 'com.archinamon'
-version = '3.0.1'
+version = '3.0.2'
 
 // local archive :: debug mode
 uploadArchives {

AspectJ-gradle/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 extendClasspath = true
 
     open var includeAspectsFromJar = mutableSetOf<String>()
     open var ajcArgs = mutableSetOf<String>()

AspectJ-gradle/src/main/kotlin/com/archinamon/plugin/PluginSetup.kt

@@ -16,8 +16,11 @@ import org.gradle.api.Project
 import org.gradle.api.plugins.PluginContainer
 
 internal fun configProject(project: Project, config: AndroidConfig, settings: AspectJExtension) {
-    project.repositories.mavenCentral()
-    project.dependencies.add("compile", "org.aspectj:aspectjrt:${settings.ajc}")
+    if (settings.extendClasspath) {
+        project.repositories.mavenCentral()
+        project.dependencies.add("compile", "org.aspectj:aspectjrt:${settings.ajc}")
+    }
+
     project.afterEvaluate {
         prepareVariant(config)
         configureCompiler(project, config)

AspectJ-gradle/src/test/groovy/com/archinamon/AndroidAspectJTest.groovy

@@ -0,0 +1,53 @@
+package com.archinamon
+
+import org.gradle.api.GradleException
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.Test
+
+/**
+ * TODO: Add description
+ *
+ * @author archinamon on 11/04/17.
+ */
+class AndroidPluginTest {
+
+    @Test
+    fun detectAppPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.android.application")))
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj")))
+    }
+
+    @Test
+    fun detectAppExtPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.android.application")))
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-ext")))
+    }
+
+    @Test
+    fun detectLibPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.android.library")))
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj")))
+    }
+
+    @Test
+    fun detectLibExtPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.android.library")))
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-ext")))
+    }
+
+    @Test(expected = GradleException::class)
+    fun failsWithoutAndroidPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj")))
+    }
+
+    @Test(expected = GradleException::class)
+    fun failsExtWithoutAndroidPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-ext")))
+    }
+}

AspectJ-gradle/src/test/kotlin/com/archinamon/AndroidPluginTest.kt

@@ -6,6 +6,7 @@ import org.junit.rules.TemporaryFolder
 import java.io.File
 
 class AarExploringTest {
+
     @Rule
     @JvmField
     val folder = TemporaryFolder()
@@ -14,5 +15,4 @@ class AarExploringTest {
     fun noNPEIfFileNotExist() {
         findPackageNameIfAar(File("/build-cache/this/file/not/exist"))
     }
-
 }

AspectJ-gradle/src/test/kotlin/com/archinamon/utils/AarExploringTest.kt

@@ -6,7 +6,7 @@ Supports writing code with AspectJ-lang in `.aj` files and in java-annotation st
 Full support of Android product flavors and build types.
 Support Kotlin, Groovy, Scala and any other languages that compiles into java bytecode.
 
-Actual version: `com.archinamon:android-gradle-aspectj:3.0.0`.
+Actual version: `com.archinamon:android-gradle-aspectj:3.0.2`.
 <br />
 Friendly with <a href="https://zeroturnaround.com/software/jrebel-for-android/" target="_blank">jRebel for Android</a>!
 
@@ -48,7 +48,7 @@ Don't forget to add `mavenCentral()` due to some dependencies inside AspectJ-gra
 
 Add the plugin to your `buildscript`'s `dependencies` section:
 ```groovy
-classpath 'com.github.Archinamon:GradleAspectJ-Android:3.0.0'
+classpath 'com.github.Archinamon:GradleAspectJ-Android:3.0.2'
 ```
 
 Apply the `aspectj` plugin:
@@ -91,6 +91,7 @@ aspectj {
     /* @see Ext plugin config **/
     includeAllJars false
     includeJar 'design', 'support-v4', 'dagger'
+    extendClasspath true
 
     includeAspectsFromJar 'my-aj-logger-lib', 'any-other-libs-with-aspects'
     ajcArgs << '-referenceInfo' << '-warn:deprecation'
@@ -113,6 +114,7 @@ All the extension parameters are have default values (all of them are described
 So no need to define them manually.
 
 - `ajc` Allows to define the aspectj runtime jar version manually (1.8.10 current)
+- `extendClasspath` Explicitly controls whether plugin should mutate the classpath with aspectj-runtime itself
 
 - `includeAllJars` Explicitly include all available jar-files into -inpath to proceed by AJ-compiler
 - `includeJar` Name filter to include any jar/aar which name or path satisfies the filter