Merge pull request #365 from AppDevNext/Espresso

Cleanup Espresso manifest

Author: hannesa2

.github/workflows/Android-CI-Espresso.yml

@@ -26,13 +26,13 @@ jobs:
           distribution: 'adopt'
           java-version: ${{ matrix.java_version }}
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.2
+        uses: malinskiy/action-android/install-sdk@release/0.1.3
       - name: Build project
         run: ./gradlew assembleDebug
       - name: Run tests
         run: ./gradlew test
       - name: Run instrumentation tests
-        uses: malinskiy/action-android/emulator-run-cmd@release/0.1.2
+        uses: malinskiy/action-android/emulator-run-cmd@release/0.1.3
         with:
           cmd: ./gradlew cAT --continue
           api: 28

sample/build.gradle

@@ -78,7 +78,7 @@ def fetchScreenshotsTask = task('fetchScreenshots', type: Exec, group: 'reportin
 }
 
 tasks.whenTaskAdded { task ->
-    if (task.name == 'connectedDebugAndroidTest') {
+    if (task.name == 'connectedDebugAndroidTest' || task.name == 'cAT') {
         task.mustRunAfter {
             clearScreenshotsTask
         }

sample/src/androidTest/AndroidManifest.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="info.mx.tracks"
-          android:versionCode="1"
-          android:versionName="1.0">
+    package="info.hannes.logcat.sampletest">
 
-    <application
-        android:label="MxTest"
-        tools:replace="label"/>
+    <application android:label="MxTest" />
 </manifest>