Merge pull request shazam#192 from shazam/agp-7-1

Update Android Gradle plugin to 7.1.3

Author: AndreiZaitcev

.github/workflows/main.yml

@@ -19,6 +19,9 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
 
+      - name: Run tests
+        run: ./build-scripts/run_tests.sh
+
       - name: Deploy Snapshot
         run: ./build-scripts/deploy_snapshot.sh
         env:

build-scripts/run_tests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# Run tests for all modules
+#
+
+set -e
+
+echo "Running tests..."
+./gradlew test

build.gradle

@@ -12,8 +12,8 @@ ext.targetCompatibility = JavaVersion.VERSION_1_8
 
 
 ext {
-    androidPluginVersion = "7.0.1"
-    ddmlibVersion = "30.0.1"
+    androidPluginVersion = "7.1.3"
+    ddmlibVersion = "30.1.3"
     jcommanderVersion = "1.48"
     slf4jVersion = "1.7.21"
     guavaVersion = "19.0"

fork-runner/src/main/java/com/shazam/fork/summary/HtmlConverters.java

@@ -25,7 +25,9 @@
 import static com.shazam.fork.model.Diagnostics.VIDEO;
 import static com.shazam.fork.summary.ResultStatus.IGNORED;
 import static com.shazam.fork.summary.ResultStatus.PASS;
-import static com.shazam.fork.utils.ReadableNames.*;
+import static com.shazam.fork.utils.ReadableNames.readableClassName;
+import static com.shazam.fork.utils.ReadableNames.readablePoolName;
+import static com.shazam.fork.utils.ReadableNames.readableTestMethodName;
 
 class HtmlConverters {
 
@@ -130,13 +132,14 @@ public static Function<LogCatMessage, HtmlLogCatMessage> toHtmlLogCatMessages()
 			@Override
 			public HtmlLogCatMessage apply(@Nullable LogCatMessage logCatMessage) {
 				HtmlLogCatMessage htmlLogCatMessage = new HtmlLogCatMessage();
-				htmlLogCatMessage.appName = logCatMessage.getAppName();
-				htmlLogCatMessage.logLevel = logCatMessage.getLogLevel().getStringValue();
+				htmlLogCatMessage.appName = logCatMessage.getHeader().getAppName();
+				htmlLogCatMessage.logLevel =
+						logCatMessage.getHeader().getLogLevel().getStringValue();
 				htmlLogCatMessage.message = logCatMessage.getMessage();
-				htmlLogCatMessage.pid = logCatMessage.getPid();
-				htmlLogCatMessage.tag = logCatMessage.getTag();
-				htmlLogCatMessage.tid = logCatMessage.getTid();
-				htmlLogCatMessage.time = logCatMessage.getTimestamp().toString();
+				htmlLogCatMessage.pid = logCatMessage.getHeader().getPid();
+				htmlLogCatMessage.tag = logCatMessage.getHeader().getTag();
+				htmlLogCatMessage.tid = logCatMessage.getHeader().getTid();
+				htmlLogCatMessage.time = logCatMessage.getHeader().getTimestamp().toString();
 				return htmlLogCatMessage;
 			}
 		};