244: Fix GMD recordMode not working as expected (#248)

* 246: Upgrade to AGP 8.8 and Gradle 8.10.2

* 244: Fix #244 GMD recordMode not working as expected

Update ManifestHelper to use alternate version of getApplicationInfo

* Fix "Unresolved reference: serviceOf"

* Fix "Inconsistent JVM-target compatibility detected for tasks 'compileJava' (21) and 'compileKotlin' (17)."

Author: DanielJette

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Testify Change Log
 
-## Unreleased
+## 3.2.1
 
+- Fix #244 "GMD recordMode not working as expected" 
+    - https://github.com/ndtp/android-testify/pull/248 - Update ManifestHelper to use alternate version of getApplicationInfo 
 - Respect Gradle console mode. See https://docs.gradle.org/current/userguide/command_line_interface.html#sec:command_line_customizing_log_format for more information.
 
 ## 3.2.0

Ext/Accessibility/README.md

@@ -18,7 +18,7 @@ For more information about _Accessibility Checking_, please see https://develope
 
 ```groovy
 plugins {
-    id("dev.testify") version "3.2.0" apply false
+    id("dev.testify") version "3.2.1" apply false
 }
 ```
 

Ext/Compose/README.md

@@ -12,7 +12,7 @@ Easily create screenshot tests for `@Composable` functions.
 
 ```groovy
 plugins {
-    id("dev.testify") version "3.2.0" apply false
+    id("dev.testify") version "3.2.1" apply false
 }
 ```
 

Ext/Fullscreen/README.md

@@ -20,7 +20,7 @@ You can set a comparison tolerance using [ScreenshotRule.setExactness](../../Lib
 
 ```groovy
 plugins {
-    id("dev.testify") version "3.2.0" apply false
+    id("dev.testify") version "3.2.1" apply false
 }
 ```
 

Library/src/main/java/dev/testify/internal/helpers/ManifestHelpers.kt

@@ -23,7 +23,6 @@
  */
 package dev.testify.internal.helpers
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Bundle
@@ -72,13 +71,8 @@ sealed class ManifestPlaceholder(val key: String) {
  * @return The [Bundle] of meta data, or null if it does not exist.
  */
 @ExcludeFromJacocoGeneratedReport
-@SuppressLint("NewApi")
 internal fun getMetaDataBundle(context: Context): Bundle? {
-    val applicationInfo = if (buildVersionSdkInt() >= android.os.Build.VERSION_CODES.TIRAMISU) {
-        context.packageManager?.getApplicationInfo(context.packageName, PackageManager.ApplicationInfoFlags.of(0))
-    } else {
-        context.packageManager?.getApplicationInfo(context.packageName, PackageManager.GET_META_DATA)
-    }
+    val applicationInfo = context.packageManager?.getApplicationInfo(context.packageName, PackageManager.GET_META_DATA)
     return applicationInfo?.metaData
 }
 
@@ -93,8 +87,8 @@ internal fun getMetaDataBundle(context: Context): Bundle? {
 @ExcludeFromJacocoGeneratedReport
 fun ManifestPlaceholder.getMetaDataValue(): String? {
     val metaData = getMetaDataBundle(InstrumentationRegistry.getInstrumentation().context)
-    return if (metaData?.containsKey(this.key) == true)
-        metaData.getString(this.key)
-    else
-        null
+    return when {
+        metaData?.containsKey(this.key) == true -> metaData.getString(this.key)
+        else -> null
+    }
 }

Plugins/Gradle/README.md

@@ -14,7 +14,7 @@ To set a dependency reference to the Testify plugin:
 
 ```groovy
 plugins {
-    id("dev.testify") version "3.2.0" apply false
+    id("dev.testify") version "3.2.1" apply false
 }
 ```
 

Plugins/Gradle/build.gradle

@@ -75,6 +75,10 @@ tasks.withType(KotlinJvmCompile).configureEach {
     }
 }
 
+java {
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 jar {
     manifest {
         attributes "Implementation-Title": "Testify"

Plugins/Gradle/src/main/kotlin/dev/testify/TestifyPlugin.kt

@@ -51,7 +51,7 @@ import dev.testify.tasks.utility.VersionTask
 import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.configurationcache.extensions.serviceOf
+import org.gradle.internal.extensions.core.serviceOf
 import org.gradle.internal.logging.text.StyledTextOutput
 import org.gradle.internal.logging.text.StyledTextOutputFactory
 
@@ -93,10 +93,12 @@ class TestifyPlugin : Plugin<Project> {
             }
             val module = settings.moduleName
             val isRecordMode = settings.isRecordMode.toString()
+            val parallelThreads = settings.parallelThreads.toString()
             android.defaultConfig {
                 it.resValue("string", "testifyDestination", destination)
                 it.resValue("string", "testifyModule", module)
                 it.resValue("string", "isRecordMode", isRecordMode)
+                it.resValue("string", "parallelThreads", parallelThreads)
             }
         }
 

README.md

@@ -67,7 +67,7 @@ Testify plugin:
 
 ```groovy
 plugins {
-    id("dev.testify") version "3.2.0" apply false
+    id("dev.testify") version "3.2.1" apply false
 }
 ```
 

Samples/Gmd/build.gradle

@@ -64,6 +64,7 @@ android {
 testify {
     useTestStorage true
     autoImplementLibrary false
+    recordMode true
 }
 
 dependencies {

gradle.properties

@@ -5,4 +5,4 @@ android.suppressUnsupportedCompileSdk=34
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.injected.androidTest.leaveApksInstalledAfterRun=true
-testify_version=3.2.0
+testify_version=3.2.1