Removing FirebaseCredential API

src/main/java/com/google/firebase/FirebaseOptions.java

@@ -25,21 +25,35 @@
 import com.google.api.client.util.Key;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.common.base.Strings;
-import com.google.firebase.auth.FirebaseCredential;
-import com.google.firebase.auth.FirebaseCredentials;
-import com.google.firebase.auth.internal.BaseCredential;
-import com.google.firebase.auth.internal.FirebaseCredentialsAdapter;
+import com.google.common.collect.ImmutableList;
 import com.google.firebase.internal.FirebaseThreadManagers;
 import com.google.firebase.internal.NonNull;
 import com.google.firebase.internal.Nullable;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /** Configurable Firebase options. */
 public final class FirebaseOptions {
 
-  // TODO: deprecate and remove it once we can fetch these from Remote Config.
+  private static final List<String> FIREBASE_SCOPES =
+      ImmutableList.of(
+          // Enables access to Firebase Realtime Database.
+          "https://www.googleapis.com/auth/firebase.database",
+
+          // Enables access to the email address associated with a project.
+          "https://www.googleapis.com/auth/userinfo.email",
+
+          // Enables access to Google Identity Toolkit (for user management APIs).
+          "https://www.googleapis.com/auth/identitytoolkit",
+
+          // Enables access to Google Cloud Storage.
+          "https://www.googleapis.com/auth/devstorage.full_control",
+
+          // Enables access to Google Cloud Firestore
+          "https://www.googleapis.com/auth/cloud-platform",
+          "https://www.googleapis.com/auth/datastore");
 
   private final String databaseUrl;
   private final String storageBucket;
@@ -53,7 +67,7 @@ public final class FirebaseOptions {
   private FirebaseOptions(@NonNull FirebaseOptions.Builder builder) {
     this.credentials = checkNotNull(builder.credentials,
         "FirebaseOptions must be initialized with setCredentials().")
-        .createScoped(BaseCredential.FIREBASE_SCOPES);
+        .createScoped(FIREBASE_SCOPES);
     this.databaseUrl = builder.databaseUrl;
     this.databaseAuthVariableOverride = builder.databaseAuthVariableOverride;
     this.projectId = builder.projectId;
@@ -230,24 +244,6 @@ public Builder setCredentials(GoogleCredentials credentials) {
       return this;
     }
 
-    /**
-     * Sets the <code>FirebaseCredential</code> to use to authenticate the SDK.
-     *
-     * @param credential A <code>FirebaseCredential</code> used to authenticate the SDK. See {@link
-     *     FirebaseCredentials} for default implementations.
-     * @return This <code>Builder</code> instance is returned so subsequent calls can be chained.
-     * @deprecated Use {@link FirebaseOptions.Builder#setCredentials(GoogleCredentials)}.
-     */
-    public Builder setCredential(@NonNull FirebaseCredential credential) {
-      checkNotNull(credential);
-      if (credential instanceof BaseCredential) {
-        this.credentials = ((BaseCredential) credential).getGoogleCredentials();
-      } else {
-        this.credentials = new FirebaseCredentialsAdapter(credential);
-      }
-      return this;
-    }
-
     /**
      * Sets the <code>auth</code> variable to be used by the Realtime Database rules.
      *