Merge pull request #57 from Archinamon/bintray

Bintray to rule them all!

Author: Archinamon

README.md

@@ -1,12 +1,13 @@
 # GradleAspectJ-Android
 [![Kotlin](https://img.shields.io/badge/Kotlin-1.1.1-blue.svg)](http://kotlinlang.org) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-AspectJ%20Gradle-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/4578) ![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg) [![](https://jitpack.io/v/Archinamon/GradleAspectJ-Android.svg)](https://jitpack.io/#Archinamon/GradleAspectJ-Android) [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
+[ ![Download](https://api.bintray.com/packages/archinamon/maven/android-gradle-aspectj/images/download.svg) ](https://bintray.com/archinamon/maven/android-gradle-aspectj/_latestVersion)
 
 A Gradle plugin which enables AspectJ for Android builds.
 Supports writing code with AspectJ-lang in `.aj` files and in java-annotation style.
 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.2`.
+Actual version: `com.archinamon:android-gradle-aspectj:3.0.3`.
 <br />
 Friendly with <a href="https://zeroturnaround.com/software/jrebel-for-android/" target="_blank">jRebel for Android</a>!
 
@@ -48,7 +49,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.2'
+classpath 'com.github.Archinamon:GradleAspectJ-Android:3.0.3'
 ```
 
 Apply the `aspectj` plugin:
@@ -149,7 +150,13 @@ Currently it has some limitations:
 
 Working tests
 -------
-Just write a test and run them! If any errors occurrs please write an issue :)
+```groovy
+apply plugin: 'com.archinamon.aspectj-test'
+```
+
+Test scope configuration inherits `aspectj-ext` behavior with strictly excluding compile and transform tasks from non-test build variant.
+In other words only instrumentation `androidTest` will work with this sub-plugin.
+In case unit tests doesn't really have any specials (excluding source/target code version base) so `aspectj-test` scope won't affect `unitTest` variants.
 
 ProGuard
 -------

AspectJ-gradle/build.gradle renamed to android-gradle-aspectj/build.gradle

@@ -6,12 +6,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 apply plugin: 'kotlin'
 apply plugin: 'maven'
+apply plugin: 'com.jfrog.bintray'
 
 project.ext {
     aspectjVersion = '1.8.10'
@@ -22,6 +24,7 @@ dependencies {
         jcenter()
         mavenCentral()
         maven { url 'http://repository.jetbrains.com/utils' }
+        maven { url "https://dl.bintray.com/archinamon/maven" }
     }
 
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
@@ -36,13 +39,34 @@ dependencies {
 }
 
 group = 'com.archinamon'
-version = '3.0.2'
+version = '3.0.3'
 
-// local archive :: debug mode
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            repository(url: uri('../'))
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives sourcesJar
+}
+
+if (project.hasProperty('bintray_user') && project.hasProperty('bintray_apiKey')) {
+    bintray {
+        user = bintray_user
+        key = bintray_apiKey
+
+        configurations = ['archives']
+        pkg {
+            repo = "maven"
+            name = "android-gradle-aspectj"
+//            websiteUrl = siteUrl
+            vcsUrl = "https://github.com/Archinamon/GradleAspectJ-Android"
+            licenses = ["Apache-2.0"]
+            publish = true
+            version {
+                name = project.version
+                released = new Date()
+            }
         }
     }
 }

AspectJ-gradle/settings.gradle renamed to android-gradle-aspectj/settings.gradle

@@ -1,6 +1,7 @@
 package com.archinamon
 
 import com.android.build.gradle.*
+import com.archinamon.plugin.ConfigScope
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import java.io.File
@@ -12,9 +13,9 @@ const val MISDEFINITION = "Illegal definition: $ASPECTJ_PLUGIN should be defined
 const private val TAG = "AJC:"
 const private val PLUGIN_EXCEPTION = "$TAG You must apply the Android plugin or the Android library plugin"
 
-internal class AndroidConfig(val project: Project) {
+internal class AndroidConfig(val project: Project, val scope: ConfigScope) {
 
-    val extAndroid: TestedExtension
+    val extAndroid: BaseExtension
     val isLibraryPlugin: Boolean
     val plugin: BasePlugin
 
@@ -27,6 +28,10 @@ internal class AndroidConfig(val project: Project) {
             extAndroid = project.extensions.getByType(LibraryExtension::class.java)
             plugin = project.plugins.getPlugin(LibraryPlugin::class.java)
             isLibraryPlugin = true
+        } else if (project.plugins.hasPlugin(TestPlugin::class.java)) {
+            extAndroid = project.extensions.getByType(TestExtension::class.java)
+            plugin = project.plugins.getPlugin(TestPlugin::class.java)
+            isLibraryPlugin = false
         } else {
             isLibraryPlugin = false
             throw GradleException(PLUGIN_EXCEPTION)

AspectJ-gradle/src/main/kotlin/com/archinamon/AndroidConfig.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/AndroidConfig.kt

@@ -49,9 +49,7 @@ internal open class AspectJCompileTask: AbstractCompile() {
             return this
         }
 
-        fun buildAndAttach() {
-            val android = AndroidConfig(project)
-
+        fun buildAndAttach(android: AndroidConfig) {
             val options = mutableMapOf(
                 Pair("overwrite", true),
                 Pair("group", "build"),

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

@@ -8,6 +8,7 @@ import com.android.build.gradle.internal.variant.BaseVariantData
 import com.android.build.gradle.internal.variant.BaseVariantOutputData
 import com.android.utils.FileUtils
 import com.archinamon.AndroidConfig
+import com.archinamon.plugin.ConfigScope
 import com.archinamon.utils.*
 import com.archinamon.utils.DependencyFilter.isIncludeFilterMatched
 import com.google.common.collect.Sets
@@ -22,13 +23,15 @@ private const val AJRUNTIME = "aspectjrt"
 private const val SLICER_DETECTED_ERROR = "Running with InstantRun slicer when weaver extended not allowed!"
 
 enum class BuildPolicy {
+
     SIMPLE,
     COMPLEX,
     LIBRARY
 }
 
 internal class StdTransformer(project: Project): AspectJTransform(project, BuildPolicy.SIMPLE)
 internal class ExtTransformer(project: Project): AspectJTransform(project, BuildPolicy.COMPLEX)
+internal class TstTransformer(project: Project): AspectJTransform(project, BuildPolicy.COMPLEX)
 internal class LibTransformer(project: Project): AspectJTransform(project, BuildPolicy.LIBRARY) {
 
     override fun getScopes(): MutableSet<QualifiedContent.Scope> {
@@ -119,6 +122,12 @@ internal sealed class AspectJTransform(val project: Project, private val policy:
     }
 
     override fun transform(transformInvocation: TransformInvocation) {
+        // bypassing transformer for non-test variant data in ConfigScope.TEST
+        if (!verifyBypassInTestScope(transformInvocation.context)) {
+            logBypassTransformation()
+            return
+        }
+
         val outputProvider = transformInvocation.outputProvider
         val includeJars = config.aspectj().includeJar
         val includeAspects = config.aspectj().includeAspectsFromJar
@@ -198,6 +207,15 @@ internal sealed class AspectJTransform(val project: Project, private val policy:
 
     /* Internal */
 
+    private fun verifyBypassInTestScope(ctx: Context): Boolean {
+        val variant = (ctx as TransformTask).variantName
+
+        return when (config.scope) {
+            ConfigScope.TEST -> variant.contains("androidtest", true)
+            else -> true
+        }
+    }
+
     private fun includeCompiledAspects(transformInvocation: TransformInvocation, outputDir: File) {
         val compiledAj = project.file("${project.buildDir}/aspectj/${(transformInvocation.context as TransformTask).variantName}")
         if (compiledAj.exists()) {

AspectJ-gradle/src/main/kotlin/com/archinamon/api/AspectJCompileTask.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/api/AspectJCompileTask.kt

@@ -5,26 +5,33 @@ import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.TestedExtension
 import com.archinamon.AndroidConfig
 import com.archinamon.AspectJExtension
-import com.archinamon.api.AspectJTransform
-import com.archinamon.api.ExtTransformer
-import com.archinamon.api.LibTransformer
-import com.archinamon.api.StdTransformer
+import com.archinamon.api.*
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import javax.inject.Inject
 
-internal sealed class AspectJWrapper: Plugin<Project> {
+internal sealed class AspectJWrapper(private val scope: ConfigScope): Plugin<Project> {
 
-    internal class Std @Inject constructor(): AspectJWrapper() {
+    internal companion object {
+        const val CONFIG_STD   = "std"
+        const val CONFIG_EXT   = "ext"
+        const val CONFIG_TEST  = "tst"
+    }
+
+    internal class Std @Inject constructor(): AspectJWrapper(ConfigScope.STD) {
         override fun getTransformer(project: Project): AspectJTransform = StdTransformer(project)
     }
 
-    internal class Ext @Inject constructor(): AspectJWrapper() {
+    internal class Ext @Inject constructor(): AspectJWrapper(ConfigScope.EXT) {
         override fun getTransformer(project: Project): AspectJTransform = ExtTransformer(project)
     }
 
+    internal class Test @Inject constructor(): AspectJWrapper(ConfigScope.TEST) {
+        override fun getTransformer(project: Project): AspectJTransform = TstTransformer(project)
+    }
+
     override fun apply(project: Project) {
-        val config = AndroidConfig(project)
+        val config = AndroidConfig(project, scope)
         val settings = project.extensions.create("aspectj", AspectJExtension::class.java)
 
         configProject(project, config, settings)

AspectJ-gradle/src/main/kotlin/com/archinamon/api/AspectJMergeJars.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/api/AspectJMergeJars.kt

@@ -0,0 +1,14 @@
+package com.archinamon.plugin
+
+/**
+ * TODO: Add description
+ *
+ * @author archinamon on 12/04/17.
+ */
+
+internal enum class ConfigScope(internal val _name: String) {
+
+    STD(AspectJWrapper.CONFIG_STD),
+    EXT(AspectJWrapper.CONFIG_EXT),
+    TEST(AspectJWrapper.CONFIG_TEST);
+}

AspectJ-gradle/src/main/kotlin/com/archinamon/api/AspectJTransform.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/api/AspectJTransform.kt

@@ -49,17 +49,21 @@ private fun prepareVariant(config: AndroidConfig) {
 }
 
 private fun configureCompiler(project: Project, config: AndroidConfig) {
-    getVariantDataList(config.plugin).forEach { variant ->
+    getVariantDataList(config.plugin).forEach variantScanner@ { variant ->
         val variantName = variant.name.capitalize()
-        val taskName = "compile${variantName}AspectJ"
 
+        // do not configure compiler task for non-test variants in ConfigScope.TEST
+        if (config.scope == ConfigScope.TEST && !variantName.contains("androidtest", true))
+            return@variantScanner
+
+        val taskName = "compile${variantName}AspectJ"
         AspectJCompileTask.Builder(project)
             .plugin(project.plugins.getPlugin(config))
             .config(project.extensions.getByType(AspectJExtension::class.java))
             .compiler(getJavaTask(variant)!!)
             .variant(variant.name)
             .name(taskName)
-            .buildAndAttach()
+            .buildAndAttach(config)
     }
 }
 

AspectJ-gradle/src/main/kotlin/com/archinamon/api/AspectJWeaver.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/api/AspectJWeaver.kt

@@ -4,6 +4,10 @@ import com.android.build.api.transform.JarInput
 import com.archinamon.api.BuildPolicy
 import java.io.File
 
+internal fun logBypassTransformation() {
+    println("---------- AspectJ tasks bypassed  with no outputs ----------")
+}
+
 internal fun logCompilationStart() {
     println("---------- Starting AspectJ sources compilation ----------")
 }

AspectJ-gradle/src/main/kotlin/com/archinamon/api/BuildTimeListener.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/api/BuildTimeListener.kt

@@ -40,7 +40,8 @@ fun findAjSourcesForVariant(project: Project, variantName: String): MutableSet<F
     if (project.file("src/main/aspectj").exists()) {
         possibleDirs.add(project.file("src/main/aspectj"))
     }
-    val types = variantName.split("(?=\\p{Upper})")
+
+    val types = variantName.split("(?=\\p{Upper})".toRegex())
     val root = project.file("src").listFiles()
 
     root.forEach { file ->

AspectJ-gradle/src/main/kotlin/com/archinamon/plugin/AspectJWrapper.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/plugin/AspectJWrapper.kt

@@ -0,0 +1 @@
+implementation-class=com.archinamon.plugin.AspectJWrapper$Test

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

@@ -25,6 +25,13 @@ class AndroidPluginTest {
         project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-ext")))
     }
 
+    @Test
+    fun detectTestPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.android.application")))
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-test")))
+    }
+
     @Test
     fun detectLibPlugin() {
         val project = ProjectBuilder.builder().build()
@@ -39,6 +46,13 @@ class AndroidPluginTest {
         project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-ext")))
     }
 
+    @Test
+    fun detectLibTestPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.android.library")))
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-test")))
+    }
+
     @Test(expected = GradleException::class)
     fun failsWithoutAndroidPlugin() {
         val project = ProjectBuilder.builder().build()
@@ -50,4 +64,10 @@ class AndroidPluginTest {
         val project = ProjectBuilder.builder().build()
         project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-ext")))
     }
+
+    @Test(expected = GradleException::class)
+    fun failsTestWithoutAndroidPlugin() {
+        val project = ProjectBuilder.builder().build()
+        project.apply(mapOf(Pair("plugin", "com.archinamon.aspectj-test")))
+    }
 }

AspectJ-gradle/src/main/kotlin/com/archinamon/plugin/PluginSetup.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/plugin/PluginSetup.kt

@@ -0,0 +1 @@
+d353182b8aa93c8318f2ae5ed5f86d4b

AspectJ-gradle/src/main/kotlin/com/archinamon/utils/AarExploring.kt renamed to android-gradle-aspectj/src/main/kotlin/com/archinamon/utils/AarExploring.kt

@@ -0,0 +1 @@
+5f7dae87f4714edadb64bc62f3d35efd24d9943d

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.archinamon</groupId>
+  <artifactId>android-gradle-aspectj</artifactId>
+  <version>3.0.3</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jre8</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.8.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjtools</artifactId>
+      <version>1.8.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>1.1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-test-junit</artifactId>
+      <version>1.1.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>