Merge pull request #34 from LikeTheSalad/release/2.2.3

Release/2.2.3

Author: LikeTheSalad

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.2.3 *(09-10-2022)*
+---
+
+* Fix #33
+
 Version 2.2.2 *(31-08-2022)*
 ---
 

README.md

@@ -312,7 +312,8 @@ So we see that the `app_name` value has been overridden by the demo's app_name,
 also for templates, we can also override templates within our demo's resources.
 
 > Those were some of the use cases that you can achieve using Android Stem, there's more of them such as overriding
-> flavors' multi languages from the base values folder and also working with multi-dimension flavors. You can play around
+> flavors' multi languages from the base values folder and also working with multi-dimension flavors. You can play
+> around
 > with it, it all should work the way you'd expect it to work.
 
 Adding it to your project
@@ -346,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.2.2"
+classpath "com.likethesalad.android:stem-plugin:2.2.3"
 ```
 
 Example:
@@ -359,7 +360,7 @@ buildscript {
     }
     dependencies {
         //...
-        classpath "com.likethesalad.android:stem-plugin:2.2.2"
+        classpath "com.likethesalad.android:stem-plugin:2.2.3"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

build.gradle

@@ -30,14 +30,15 @@ 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.2.2'
+version = '2.2.3'
 
 ext {
     dagger_version = '2.39.1'
     androidBuild_version = '7.1.0'
     testingUtilities_version = '1.0.8'
     resourceLocator_version = '2.0.0'
     androidTools_version = "1.2.0"
+    androidBuild_test_version = '7.1.0'
 }
 
 allprojects {

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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

stem-plugin/build.gradle

@@ -4,6 +4,18 @@ plugins {
     id 'kotlin-kapt'
 }
 
+configurations {
+    testPluginDependency {
+        canBeResolved(false)
+        canBeConsumed(false)
+    }
+    testPluginClasspath {
+        canBeConsumed(false)
+        canBeResolved(true)
+        extendsFrom(testPluginDependency)
+    }
+}
+
 dependencies {
     embedded "com.google.dagger:dagger:$dagger_version"
     embedded project(':templates-provider-plugin')
@@ -14,12 +26,16 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
     testImplementation "com.likethesalad.tools.testing:android-gradle:$testingUtilities_version"
     testImplementation "com.likethesalad.tools.testing:unit-testing:$testingUtilities_version"
-    testImplementation "com.android.tools.build:gradle:$androidBuild_version"
     testImplementation "net.lingala.zip4j:zip4j:2.9.1"
+    testPluginDependency "com.android.tools.build:gradle:$androidBuild_test_version"
 }
 
 tasks.withType(PluginUnderTestMetadata).configureEach {
-    pluginClasspath.from(configurations.compileOnly)
+    pluginClasspath.from(configurations.testPluginClasspath)
+}
+
+tasks.withType(Test) {
+    systemProperty "agpVersion", androidBuild_test_version
 }
 
 kapt {

stem-plugin/src/functionalTest/kotlin/com/likethesalad/stem/CheckOutputsTest.kt

@@ -21,8 +21,8 @@ class CheckOutputsTest : AndroidProjectTest() {
     companion object {
         private const val RESOLVER_PLUGIN_ID = "com.likethesalad.stem"
         private const val PROVIDER_PLUGIN_ID = "com.likethesalad.stem-library"
-        private const val ANDROID_PLUGIN_VERSION = "7.1.0"
         private const val GRADLE_VERSION = "7.2"
+        private val ANDROID_PLUGIN_VERSION = System.getProperty("agpVersion")
     }
 
     private val inputAssetsProvider = TestAssetsProvider("functionalTest", "inputs")

stem-plugin/src/main/java/com/likethesalad/stem/ResolvePlaceholdersPlugin.kt

@@ -1,8 +1,11 @@
 package com.likethesalad.stem
 
+import com.android.build.api.AndroidPluginVersion
+import com.android.build.api.variant.AndroidComponentsExtension
 import com.likethesalad.android.templates.common.plugins.BaseTemplatesProcessorPlugin
 import com.likethesalad.stem.di.AppInjector
 import com.likethesalad.stem.locator.listener.TypeLocatorCreationListener
+import com.likethesalad.stem.modules.common.helpers.dirs.VariantBuildResolvedDir.Companion.getBuildRelativeResolvedDir
 import com.likethesalad.stem.providers.AndroidExtensionProvider
 import com.likethesalad.stem.providers.LocatorExtensionProvider
 import com.likethesalad.stem.providers.ProjectDirsProvider
@@ -49,6 +52,24 @@ class ResolvePlaceholdersPlugin : BaseTemplatesProcessorPlugin(), AndroidExtensi
             templateResourcesEntryPointFactory.create(commonSourceConfigurationCreator),
             creationListener
         )
+        validateAgp73AddingSrcDirs(project)
+    }
+
+    private fun validateAgp73AddingSrcDirs(project: Project) {
+        try {
+            val androidComponentsExtension = project.extensions.getByType(AndroidComponentsExtension::class.java)
+            if (androidComponentsExtension.pluginVersion >= AndroidPluginVersion(7, 3)) {
+                androidComponentsExtension.onVariants {
+                    val variantName = it.name
+                    androidExtension.addVariantSrcDir(
+                        variantName,
+                        project.layout.buildDirectory.dir(getBuildRelativeResolvedDir(variantName))
+                    )
+                }
+            }
+        } catch (ignored: NoClassDefFoundError) {
+            // When AGP < 7
+        }
     }
 
     fun getGradleLogger(): Logger {

stem-plugin/src/main/java/com/likethesalad/stem/modules/common/helpers/dirs/VariantBuildResolvedDir.kt

@@ -19,13 +19,16 @@ class VariantBuildResolvedDir @AssistedInject constructor(
 
     companion object {
         val RESOLVED_DIR_BUILD_RELATIVE_PATH = "generated${File.separator}resolved"
+
+        fun getBuildRelativeResolvedDir(variantName: String): String {
+            return "$RESOLVED_DIR_BUILD_RELATIVE_PATH${File.separator}$variantName"
+        }
     }
 
     private val variantName by lazy { androidVariantData.getVariantName() }
 
     val resolvedDir: File by lazy {
-        val dir =
-            File(projectDirsProvider.getBuildDir(), "$RESOLVED_DIR_BUILD_RELATIVE_PATH${File.separator}$variantName")
+        val dir = File(projectDirsProvider.getBuildDir(), getBuildRelativeResolvedDir(variantName))
         sourceSetsHandler.addToSourceSets(dir, variantName)
         dir
     }

stem-plugin/src/main/java/com/likethesalad/stem/modules/resolveStrings/resolver/RecursiveLevelDetector.kt

@@ -68,7 +68,7 @@ class RecursiveLevelDetector @Inject constructor() {
             }
 
             // Grab the highest level, that will be this current template level
-            levels.max()!!
+            levels.maxOrNull()!!
         } else {
             0
         }