Add workaround

pedrovgs · Aug 5, 2021 · 8b1f97b · 8b1f97b
1 parent 1f34784
commit 8b1f97b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,6 +42,9 @@ jobs:
       - name: Execute screenshot tests for shot-consumer-flavors blue flavor
         run: ./gradlew blueCustomBuildTypeExecuteScreenshotTests
         working-directory: shot-consumer-flavors
+      - name: Execute screenshot tests for shot-consumer-compose
+        run: ./gradlew executeScreenshotTests
+        working-directory: shot-consumer-library
       - uses: actions/upload-artifact@v2
         if: always()
         with:

diff --git a/shot/build.gradle b/shot/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     implementation gradleApi()
     implementation localGroovy()
     implementation project(':core')
-    compileOnly 'com.android.tools.build:gradle:7.1.0-alpha05'
+    compileOnly 'com.android.tools.build:gradle:7.1.0-alpha06'
     implementation 'org.scala-lang:scala-library:2.12.13'
 
     testImplementation 'org.scalatest:scalatest_2.12:3.2.6'

diff --git a/shot/src/main/scala/com/karumi/shot/ShotExtension.scala b/shot/src/main/scala/com/karumi/shot/ShotExtension.scala
@@ -11,9 +11,10 @@ class ShotExtension(
     @BeanProperty var runInstrumentation: Boolean,
     @BeanProperty var useComposer: Boolean,
     @BeanProperty var tolerance: Double,
-    @BeanProperty var showOnlyFailingTestsInReports: Boolean
+    @BeanProperty var showOnlyFailingTestsInReports: Boolean,
+    @BeanProperty var applicationId: String
 ) {
 
-  def this() = this(true, false, Config.defaultTolerance, false)
+  def this() = this(true, false, Config.defaultTolerance, false, "")
 
 }
diff --git a/shot/src/main/scala/com/karumi/shot/ShotPlugin.scala b/shot/src/main/scala/com/karumi/shot/ShotPlugin.scala
@@ -95,14 +95,27 @@ class ShotPlugin extends Plugin[Project] {
   ) = {
     val flavor = variant.getMergedFlavor
     checkIfApplicationIdIsConfigured(project, flavor)
-    val completeAppId = composeCompleteAppId(variant)
+    val completeAppId = composeCompleteAppId(project, variant)
     val appTestId =
       Option(flavor.getTestApplicationId).getOrElse(completeAppId)
     addTasksFor(project, variant.getFlavorName, variant.getBuildType, appTestId, baseTask)
   }
 
-  private def composeCompleteAppId(variant: BaseVariant) =
-    variant.getApplicationId + ".test"
+  private def composeCompleteAppId(project: Project, variant: BaseVariant): String = {
+    val appId = try {
+      variant.getApplicationId
+    } catch {
+      case _: Throwable =>
+        console.showWarning("Error found trying to get applicationId from library module. We will use the extension applicationId param as a workaround.")
+        console.showWarning("More information about this AGP7.0.1 bug can be found here: https://github.com/Karumi/Shot/issues/247")
+        val extension = project.getExtensions.getByType[ShotExtension](classOf[ShotExtension])
+        val extensionAppIdValue = extension.applicationId
+        console.showWarning(s"Extension applicationId value read = $extensionAppIdValue")
+        extensionAppIdValue
+    }
+    appId + ".test"
+  }
+
 
   private def checkIfApplicationIdIsConfigured(project: Project, flavor: ProductFlavor) =
     if (isAnAndroidLibrary(project) && flavor.getTestApplicationId == null) {