AGP 4.1.0 support

Author: Vlad Eremia

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

@@ -24,7 +24,7 @@ internal class AndroidConfig(val project: Project, val scope: ConfigScope) {
 
     val extAndroid: BaseExtension
     val isLibraryPlugin: Boolean
-    val plugin: BasePlugin
+    val plugin: BasePlugin<*, *>
 
     init {
         when {
@@ -55,7 +55,7 @@ internal class AndroidConfig(val project: Project, val scope: ConfigScope) {
 
     @Suppress("UNCHECKED_CAST")
     fun getBootClasspath(): List<File> {
-        return extAndroid.bootClasspath ?: plugin::class.java.getMethod("getRuntimeJarList").invoke(plugin) as List<File>
+        return extAndroid.bootClasspath
     }
 
     fun aspectj(): AspectJExtension {

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

@@ -1,9 +1,9 @@
 package com.archinamon.api.transform
 
 import com.android.build.api.transform.*
+import com.android.build.api.variant.impl.VariantPropertiesImpl
 import com.android.build.gradle.internal.pipeline.TransformInvocationBuilder
 import com.android.build.gradle.internal.pipeline.TransformManager
-import com.android.build.gradle.internal.pipeline.TransformTask
 import com.android.build.gradle.internal.variant.BaseVariantData
 import com.android.utils.FileUtils
 import com.archinamon.AndroidConfig
@@ -52,8 +52,8 @@ internal abstract class AspectJTransform(val project: Project, private val polic
         return this
     }
 
-    private fun <T: BaseVariantData> setupVariant(variantData: T) {
-        val javaTask = getJavaTask(variantData)
+    private fun <T: BaseVariantData> setupVariant(variantData: Pair<T, VariantPropertiesImpl>) {
+        val javaTask = getJavaTask(variantData.first)
         getAjSourceAndExcludeFromJavac(project, variantData)
         aspectJWeaver.encoding = javaTask.options.encoding
         aspectJWeaver.sourceCompatibility = config.aspectj().java.toString()
@@ -169,8 +169,8 @@ internal abstract class AspectJTransform(val project: Project, private val polic
             }
         }
 
-        val classpathFiles = aspectJWeaver.classPath.filter { it.isDirectory && it.list().isNotEmpty() }
-        val inpathFiles = aspectJWeaver.inPath.filter { it.isDirectory && it.list().isNotEmpty() }
+        val classpathFiles = aspectJWeaver.classPath.filter { it.isDirectory && !it.list().isNullOrEmpty() }
+        val inpathFiles = aspectJWeaver.inPath.filter { it.isDirectory && !it.list().isNullOrEmpty() }
         if (inpathFiles.isEmpty() || classpathFiles.isEmpty()) {
             logNoAugmentation()
             return

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

@@ -50,15 +50,15 @@ private fun prepareVariant(config: AndroidConfig) {
 
     // applies srcSet 'aspectj' for each build variant
     getVariantDataList(config.plugin).forEach { variant ->
-        val props = variant.publicVariantPropertiesApi
+        val props = variant.second
         props.productFlavors.forEach { applier(it.second) }
         applier(props.buildType ?: props.flavorName)
     }
 }
 
 private fun configureCompiler(project: Project, config: AndroidConfig) {
     getVariantDataList(config.plugin).forEach variantScanner@ { variant ->
-        val variantName = variant.name.capitalize()
+        val variantName = variant.second.name.capitalize()
 
         // do not configure compiler task for non-test variants in ConfigScope.JUNIT
         if (config.scope == ConfigScope.JUNIT && variantName.contains("androidtest", true))
@@ -68,21 +68,21 @@ private fun configureCompiler(project: Project, config: AndroidConfig) {
         val ajc = AspectJCompileTask.Builder(project)
                 .plugin(project.plugins.getPlugin(config))
                 .config(project.extensions.getByType(AspectJExtension::class.java))
-                .compiler(getJavaTask(variant))
-                .variant(variant.name)
+                .compiler(getJavaTask(variant.first))
+                .variant(variant.second.name)
                 .name(taskName)
 
-        val variantTypeClass: Class<*> = variant.type::class.java
+        val variantTypeClass: Class<*> = variant.second.variantType::class.java
         val variantAnalyticsType: Any? = when {
             variantTypeClass.fields.any { it.name == "mAnalyticsVariantType" } ->
-                variantTypeClass.getField("mAnalyticsVariantType").get(variant.type)
+                variantTypeClass.getField("mAnalyticsVariantType").get(variant.second.variantType)
             variantTypeClass.fields.any { it.name == "analyticsVariantType" } ->
-                variantTypeClass.getField("analyticsVariantType").get(variant.type)
+                variantTypeClass.getField("analyticsVariantType").get(variant.second.variantType)
             variantTypeClass.enumConstants?.isNotEmpty() == true ->
                 variantTypeClass.enumConstants[5] // suspect to find UNIT_TEST
                         ?.javaClass
                         ?.getMethod("getAnalyticsVariantType")
-                        ?.invoke(variant.type)
+                        ?.invoke(variant.second.variantType)
             else -> null
         }
 
@@ -121,5 +121,7 @@ private inline fun <reified T> PluginContainer.getPlugin(config: AndroidConfig):
 }
 
 private inline fun <reified T> Project.whenEvaluated(noinline fn: Project.() -> T) {
-    if (state.executed) fn() else afterEvaluate(fn::invoke)
+    if (state.executed) fn() else afterEvaluate {
+        fn.invoke(this)
+    }
 }

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

@@ -1,8 +1,8 @@
 package com.archinamon.utils
 
+import com.android.build.api.variant.impl.VariantPropertiesImpl
 import com.android.build.gradle.internal.plugins.BasePlugin
 import com.android.build.gradle.internal.scope.TaskContainer
-import com.android.build.gradle.internal.scope.VariantScope
 import com.android.build.gradle.internal.variant.BaseVariantData
 import org.gradle.api.Project
 import org.gradle.api.file.FileCollection
@@ -50,9 +50,9 @@ fun getJavaTask(baseVariantData: BaseVariantData): JavaCompile {
     return baseVariantData.taskContainer.javacTask.get()
 }
 
-fun getAjSourceAndExcludeFromJavac(project: Project, variantData: BaseVariantData): FileCollection {
-    val javaTask = getJavaTask(variantData)
-    val props = variantData.publicVariantPropertiesApi
+fun getAjSourceAndExcludeFromJavac(project: Project, variantData: Pair<BaseVariantData, VariantPropertiesImpl>): FileCollection {
+    val javaTask = getJavaTask(variantData.first)
+    val props = variantData.second
 
     val flavors: List<String>? = props.productFlavors.map { flavor -> flavor.second }
     val srcSet = mutableListOf("main", props.buildType ?: props.flavorName)
@@ -97,12 +97,10 @@ fun findSourcesForVariant(project: Project, variantName: String, language: Strin
     return LinkedHashSet(possibleDirs)
 }
 
-fun getVariantDataList(plugin: BasePlugin): List<BaseVariantData> {
-    return getVariantScopes(plugin).map(VariantScope::getVariantData)
-}
-
-fun getVariantScopes(plugin: BasePlugin): List<VariantScope> {
-    return plugin.variantManager.variantScopes
+fun getVariantDataList(plugin: BasePlugin<*, *>): List<Pair<BaseVariantData, VariantPropertiesImpl>> {
+    return plugin.variantManager.mainComponents.map {
+        it.properties.variantData to it.properties
+    }
 }
 
 internal infix fun <E> MutableCollection<in E>.shl(elem: E): MutableCollection<in E> {

gradle.properties

@@ -1,7 +1,7 @@
 aspectjPluginGroup=com.archinamon
-aspectjPluginVersion=4.1.0
+aspectjPluginVersion=4.3.0
 
-androidGradleVersion=4.0.0
+androidGradleVersion=4.1.0
 aspectjVersion=1.9.4
-kotlinVersion=1.3.71
+kotlinVersion=1.4.10
 org.gradle.jvmargs=-Xms256m -Xmx256m -Dfile.encoding=UTF-8