Fix merge conflict

build.gradle

@@ -423,11 +423,16 @@ subprojects { subproj ->
 				'-XepAllDisabledChecksAsWarnings',
 
 				// generates too many false positives on constructors that call other constructors.
-				// TODO: Once #939 is resolved, see if constructors can be refactored more easily
+				// TODO: once #939 is resolved, see if constructors can be refactored more easily
 				// to not call each other.
 				'-Xep:ConstructorLeaksThis:OFF',
 
-				// we target Java 8
+				// TODO: investigate if this check is worth turning on for production files,
+				// and if so, find places where com.google.errorprone.annotations.@Immutable could
+				// be applied
+				'-Xep:Immutable:OFF',
+
+				// we target Java 8, not Android
 				'-Xep:StaticOrDefaultInterfaceMethod:OFF',
 
 				// we declare redundant `throws <general-exception>, <more-specific-exception>` for
@@ -445,18 +450,20 @@ subprojects { subproj ->
 			options.compilerArgs += [
 				'-XepAllDisabledChecksAsWarnings',
 
-				// these checks are often violated on purpose for testing reasons
 				'-Xep:ClassCanBeStatic:OFF',
 				'-Xep:ConstantField:OFF',
 				'-Xep:ConstructorInvokesOverridable:OFF',
 				'-Xep:ConstructorLeaksThis:OFF',
+
+				// TODO: investigate if its worth turning this check on for tests
+				'-Xep:Immutable:OFF',
+
 				'-Xep:MethodCanBeStatic:OFF',
 				'-Xep:PrivateConstructorForUtilityClass:OFF',
 				'-Xep:StaticOrDefaultInterfaceMethod:OFF',
 				'-Xep:ThrowsUncheckedException:OFF',
 				'-Xep:UngroupedOverloads:OFF',
 
-				// produces lots of warnings, none critical but potentially useful
 				// TODO: investigate if its worth turning this check on for tests
 				'-Xep:Var:OFF'
 			]

junit-platform-console/src/main/java/org/junit/platform/console/tasks/TreePrinter.java

@@ -25,7 +25,6 @@
 
 import com.google.errorprone.annotations.Var;
 
-import org.junit.platform.commons.meta.API;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.platform.console.options.Theme;
 import org.junit.platform.engine.TestExecutionResult;

junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java

@@ -15,6 +15,8 @@
 import java.io.Serializable;
 import java.util.Objects;
 
+import com.google.errorprone.annotations.Var;
+
 import org.junit.platform.commons.meta.API;
 import org.junit.platform.commons.util.PreconditionViolationException;
 import org.junit.platform.commons.util.Preconditions;
@@ -60,7 +62,7 @@ public final class TestTag implements Serializable {
 	 * @see StringUtils#doesNotContainIsoControlCharacter(String)
 	 * @see TestTag#create(String)
 	 */
-	public static boolean isValid(String name) {
+	public static boolean isValid(@Var String name) {
 		if (name == null) {
 			return false;
 		}