Merge branch 'main' into dconeybe/dataconnect/DemoDokka2

Author: dconeybe

firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java

@@ -16,7 +16,6 @@
 
 import static org.junit.Assert.assertArrayEquals;
 
-import android.os.Build;
 import com.google.firebase.storage.internal.AdaptiveStreamBuffer;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -30,7 +29,7 @@
 
 /** Tests for {@link AdaptiveStreamBuffer}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Config.OLDEST_SDK)
 public class AdaptiveStreamBufferTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);

firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java

@@ -14,7 +14,6 @@
 
 package com.google.firebase.storage;
 
-import android.os.Build;
 import com.google.android.gms.tasks.Task;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -29,7 +28,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Config.OLDEST_SDK)
 public class DependencyTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);

firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java

@@ -16,7 +16,6 @@
 
 import static com.google.firebase.common.testutil.Assert.assertThrows;
 
-import android.os.Build;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
@@ -38,7 +37,7 @@
 
 /** Tests for {@link FirebaseStorage}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Config.OLDEST_SDK)
 public class StorageReferenceTest {
 
   @Rule public RetryRule retryRule = new RetryRule(3);

firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java

@@ -16,7 +16,6 @@
 
 import static com.google.firebase.common.testutil.Assert.assertThrows;
 
-import android.os.Build;
 import com.google.firebase.storage.StreamDownloadTask.StreamProgressWrapper;
 import com.google.firebase.storage.network.MockInputStreamHelper;
 import java.io.ByteArrayInputStream;
@@ -35,7 +34,7 @@
 
 /** Tests for {@link StreamProgressWrapper}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1)
+@Config(sdk = Config.OLDEST_SDK)
 @SuppressWarnings("ResultOfMethodCallIgnored")
 public class StreamProgressWrapperTest {
 

gradle/libs.versions.toml

@@ -31,7 +31,7 @@ firebaseCrashlyticsGradle = "3.0.4"
 glide = "4.16.0"
 googleApiClient = "1.30.9"
 googleServices = "4.3.15"
-gradleErrorpronePlugin = "3.1.0"
+gradleErrorpronePlugin = "4.2.0"
 grpc = "1.62.2"
 grpcKotlin = "1.4.1"
 hamcrest = "2.2"