Merge pull request #40 from LikeTheSalad/release/2.4.0

Release/2.4.0

Author: LikeTheSalad

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.4.0 *(26-04-2023)*
+---
+
+* Made Stem aware of mapSourceSetPaths task (Fix #39)
+
 Version 2.3.0 *(07-01-2023)*
 ---
 

README.md

@@ -347,7 +347,7 @@ First, in your `Root's build.gradle` file, you'll need to add this
 line into your `buildscript` dependencies block:
 
 ```groovy
-classpath "com.likethesalad.android:stem-plugin:2.3.0"
+classpath "com.likethesalad.android:stem-plugin:2.4.0"
 ```
 
 Example:
@@ -360,7 +360,7 @@ buildscript {
     }
     dependencies {
         //...
-        classpath "com.likethesalad.android:stem-plugin:2.3.0"
+        classpath "com.likethesalad.android:stem-plugin:2.4.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

build.gradle

@@ -30,7 +30,7 @@ artifactPublisher {
 
 description = "This is a Gradle plugin for Android applications which resolves XML string references in other XML strings."
 group = 'com.likethesalad.android'
-version = '2.3.0'
+version = "2.4.0"
 
 ext {
     dagger_version = '2.39.1'

stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/android/AndroidVariantContext.kt

@@ -35,12 +35,6 @@ class AndroidVariantContext @AssistedInject constructor(
     val mergeResourcesTask: Task by lazy {
         taskProvider.findTaskByName(tasksNames.mergeResourcesName)!!
     }
-    val packageResourcesTask: Task? by lazy {
-        taskProvider.findTaskByName(tasksNames.packageResourcesName)
-    }
-    val extractDeeplinksTask: Task? by lazy {
-        taskProvider.findTaskByName(tasksNames.extractDeeplinksName)
-    }
     val incrementalDir: String by lazy {
         projectDirsProvider.getBuildDir().absolutePath + "/intermediates/incremental/" + tasksNames.resolvePlaceholdersName
     }
@@ -51,4 +45,8 @@ class AndroidVariantContext @AssistedInject constructor(
         outputStringFileResolver,
         resourceSerializer
     )
+
+    fun findVariantTask(template: String): Task? {
+        return taskProvider.findTaskByName(tasksNames.resolveTaskName(template))
+    }
 }

stem-plugin/src/main/java/com/likethesalad/stem/modules/common/models/TasksNamesModel.kt

@@ -18,8 +18,6 @@ class TasksNamesModel @AssistedInject constructor(@Assisted androidVariantData:
         private const val GATHER_STRING_TEMPLATES_NAME_FORMAT = "gather%sStringTemplates"
         private const val RESOLVE_PLACEHOLDERS_NAME_FORMAT = "resolve%sPlaceholders"
         private const val ANDROID_MERGE_RESOURCES_TASK_NAME_FORMAT = "merge%sResources"
-        private const val ANDROID_PACKAGE_RESOURCES_TASK_NAME_FORMAT = "package%sResources"
-        private const val ANDROID_EXTRACT_DEEPLINKS_TASK_NAME_FORMAT = "extractDeepLinks%s"
     }
 
     private val capitalizedBuildVariant = androidVariantData.getVariantName().upperFirst()
@@ -40,11 +38,7 @@ class TasksNamesModel @AssistedInject constructor(@Assisted androidVariantData:
         ANDROID_MERGE_RESOURCES_TASK_NAME_FORMAT.format(capitalizedBuildVariant)
     }
 
-    val packageResourcesName: String by lazy {
-        ANDROID_PACKAGE_RESOURCES_TASK_NAME_FORMAT.format(capitalizedBuildVariant)
-    }
-
-    val extractDeeplinksName: String by lazy {
-        ANDROID_EXTRACT_DEEPLINKS_TASK_NAME_FORMAT.format(capitalizedBuildVariant)
+    fun resolveTaskName(template: String): String {
+        return template.format(capitalizedBuildVariant)
     }
 }

stem-plugin/src/main/java/com/likethesalad/stem/utils/PlaceholderTasksCreator.kt

@@ -81,8 +81,25 @@ class PlaceholderTasksCreator @Inject constructor(
 
         postConfigurationProvider.executeAfterEvaluate {
             androidVariantContext.mergeResourcesTask.dependsOn(resolvePlaceholdersTask)
-            androidVariantContext.packageResourcesTask?.dependsOn(resolvePlaceholdersTask)
-            androidVariantContext.extractDeeplinksTask?.dependsOn(resolvePlaceholdersTask)
+            addExplicitDependencies(
+                androidVariantContext,
+                resolvePlaceholdersTask,
+                listOf(
+                    "map%sSourceSetPaths",
+                    "package%sResources",
+                    "extractDeepLinks%s"
+                )
+            )
+        }
+    }
+
+    private fun addExplicitDependencies(
+        androidVariantContext: AndroidVariantContext,
+        resolvePlaceholdersTask: TaskProvider<ResolvePlaceholdersTask>,
+        dependantTaskNames: List<String>
+    ) {
+        dependantTaskNames.forEach { nameTemplate ->
+            androidVariantContext.findVariantTask(nameTemplate)?.mustRunAfter(resolvePlaceholdersTask)
         }
     }
 

stem-plugin/src/test/java/com/likethesalad/stem/models/TasksNamesModelTest.kt

@@ -39,6 +39,14 @@ class TasksNamesModelTest {
         Truth.assertThat(tasksNamesModel.mergeResourcesName).isEqualTo("mergeResources")
     }
 
+    @Test
+    fun check_genericTaskName() {
+        val tasksNamesModel = getTasksNamesFor("debug")
+
+        Truth.assertThat(tasksNamesModel.resolveTaskName("package%sResources")).isEqualTo("packageDebugResources")
+        Truth.assertThat(tasksNamesModel.resolveTaskName("extractDeepLinks%s")).isEqualTo("extractDeepLinksDebug")
+    }
+
     private fun getTasksNamesFor(variantName: String): TasksNamesModel {
         val androidVariantData = mockk<AndroidVariantData>()
         every { androidVariantData.getVariantName() }.returns(variantName)

stem-test/app/build.gradle

@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdk 32
+    namespace "com.likethesalad.stem.test"
 
     defaultConfig {
         applicationId "com.likethesalad.stem.test"

stem-test/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.likethesalad.stem.test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

stem-test/gradle.properties

@@ -1,2 +1,2 @@
 android.useAndroidX=true
-agpTest_version=7.2.0
+agpTest_version=7.4.0

stem-test/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Wed Aug 28 16:11:02 IST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists