Merge branch 'master' of github.com:firebase/firebase-android-sdk into fisExceptionFix

Author: ankitaj224

firebase-abt/firebase-abt.gradle

@@ -14,44 +14,18 @@
 
 plugins {
     id 'firebase-library'
-    id 'com.google.protobuf'
 }
 
 firebaseLibrary {
     testLab.enabled = false
     publishSources = true
 }
 
-// TODO(issue/568): Remove this once legacy logic is removed from Remote Config.
-protobuf {
-    protoc {
-        artifact = "com.google.protobuf:protoc:$protocVersion"
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                java { option 'lite' }
-            }
-        }
-    }
-}
-
 android {
 
     lintOptions {
         abortOnError false
     }
-    sourceSets {
-        main {
-            proto {
-                srcDir 'src/proto'
-            }
-
-	    resources {
-	        srcDir 'src/proto/com/google/protos'
-	    }
-        }
-    }
 
     compileSdkVersion project.targetSdkVersion
     defaultConfig {
@@ -78,13 +52,11 @@ dependencies {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
     implementation 'com.google.android.gms:play-services-basement:17.0.0'
-    implementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation 'com.google.truth:truth:0.44'
     testImplementation 'junit:junit:4.13-beta-2'
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'io.grpc:grpc-testing:1.12.0'
     testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
 }

firebase-abt/gradle.properties

@@ -1,2 +1,2 @@
-version=19.1.1
+version=20.0.0
 latestReleasedVersion=19.1.0

firebase-config/firebase-config.gradle

@@ -16,29 +16,13 @@
 
 plugins {
     id 'firebase-library'
-    id 'com.google.protobuf'
 }
 
 firebaseLibrary {
     testLab.enabled = true
     publishSources = true
 }
 
-protobuf {
-    // Configure the protoc executable
-    protoc {
-        // Download from repositories
-        artifact = "com.google.protobuf:protoc:$protocVersion"
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                java { option 'lite' }
-            }
-        }
-    }
-}
-
 android {
     compileSdkVersion project.targetSdkVersion
     defaultConfig {
@@ -50,12 +34,6 @@ android {
     }
 
     sourceSets {
-        main {
-            proto {
-                srcDir 'src/proto'
-            }
-        }
-
         androidTest.resources.srcDirs += ['src/androidTest/res']
     }
     compileOptions {
@@ -78,7 +56,6 @@ dependencies {
     runtimeOnly project(':firebase-installations')
 
     implementation 'com.google.firebase:firebase-measurement-connector:18.0.0'
-    implementation "com.google.protobuf:protobuf-javalite:$javaliteVersion"
     implementation 'com.google.android.gms:play-services-tasks:17.0.2'
 
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'

firebase-config/gradle.properties

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version=19.2.1
+version=20.0.0
 latestReleasedVersion=19.2.0
 android.enableUnitTestBinaryResources=true
 

firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java

@@ -33,7 +33,6 @@
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
 import com.google.firebase.remoteconfig.internal.ConfigStorageClient;
-import com.google.firebase.remoteconfig.internal.LegacyConfigsHandler;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
@@ -99,7 +98,6 @@ public class RemoteConfigComponent {
         firebaseInstallations,
         firebaseAbt,
         analyticsConnector,
-        new LegacyConfigsHandler(context, firebaseApp.getOptions().getApplicationId()),
         /* loadGetDefault= */ true);
   }
 
@@ -112,7 +110,6 @@ protected RemoteConfigComponent(
       FirebaseInstallationsApi firebaseInstallations,
       FirebaseABTesting firebaseAbt,
       @Nullable AnalyticsConnector analyticsConnector,
-      LegacyConfigsHandler legacyConfigsHandler,
       boolean loadGetDefault) {
     this.context = context;
     this.executorService = executorService;
@@ -129,7 +126,6 @@ protected RemoteConfigComponent(
     if (loadGetDefault) {
       // Loads the default namespace's configs from disk on App startup.
       Tasks.call(executorService, this::getDefault);
-      Tasks.call(executorService, legacyConfigsHandler::saveLegacyConfigsIfNecessary);
     }
   }
 
@@ -206,15 +202,6 @@ public synchronized void setCustomHeaders(Map<String, String> customHeaders) {
   }
 
   private ConfigCacheClient getCacheClient(String namespace, String configStoreType) {
-    return getCacheClient(context, appId, namespace, configStoreType);
-  }
-
-  /**
-   * The {@link LegacyConfigsHandler} needs access to multiple cache clients, and the simplest way
-   * to provide it access is to keep this method public and static.
-   */
-  public static ConfigCacheClient getCacheClient(
-      Context context, String appId, String namespace, String configStoreType) {
     String fileName =
         String.format(
             "%s_%s_%s_%s.json",