Resolve some changes from the rebase on fad/next

Author: lfkellogg

build.gradle

@@ -39,6 +39,7 @@ buildscript {
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
         classpath 'com.google.gms:google-services:4.3.3'
+        classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
         classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
         classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.2'
     }

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/LogWrapper.java

@@ -84,10 +84,6 @@ void e(@NonNull String msg, @NonNull Throwable tr) {
     Log.e(LOG_TAG, msg, tr);
   }
 
-  void e(@NonNull String additionalTag, @NonNull String msg) {
-    Log.e(LOG_TAG, prependTag(additionalTag, msg));
-  }
-
   void e(@NonNull String additionalTag, @NonNull String msg, @NonNull Throwable tr) {
     Log.e(LOG_TAG, prependTag(additionalTag, msg), tr);
   }

firebase-appdistribution/src/test/java/com/google/firebase/appdistribution/impl/ImageUtilsTest.java

@@ -163,14 +163,15 @@ public void readScaledImage_negativeDimensions_throws() {
   }
 
   @Test
-  public void readScaledImage_doesntExist_returnsNull() throws IOException {
-    Bitmap result =
-        ImageUtils.readScaledImage(
-            contentResolver,
-            Uri.fromFile(new File("nonexistent.png")),
-            TEST_SCREENSHOT_WIDTH / 4,
-            TEST_SCREENSHOT_HEIGHT / 4);
-    assertThat(result).isNull();
+  public void readScaledImage_doesntExist_throws() throws IOException {
+    assertThrows(
+        IOException.class,
+        () ->
+            ImageUtils.readScaledImage(
+                contentResolver,
+                Uri.fromFile(new File("nonexistent.png")),
+                TEST_SCREENSHOT_WIDTH / 4,
+                TEST_SCREENSHOT_HEIGHT / 4));
   }
 
   private static byte[] writeBitmapToByteArray() throws IOException {

firebase-appdistribution/test-app/src/main/java/com/googletest/firebase/appdistribution/testapp/MainActivity.kt

@@ -29,6 +29,7 @@ import java.util.concurrent.Executors
 class MainActivity : AppCompatActivity() {
 
     var firebaseAppDistribution = Firebase.appDistribution
+    var updateTask: Task<Void>? = null
     val executorService: ExecutorService = Executors.newFixedThreadPool(1)
 
     lateinit var signInButton: AppCompatButton
@@ -47,8 +48,6 @@ class MainActivity : AppCompatActivity() {
     lateinit var progressBar: ProgressBar
     lateinit var feedbackTriggerMenu: TextInputLayout
 
-    var updateTask: Task<Void>? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)