Merge branch 'master' into ss-firestore-emulator-settings

Author: samtstern

apk-size/apk-size.gradle

@@ -20,7 +20,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 

build.gradle

@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.7.1'
         classpath 'org.jsoup:jsoup:1.11.2'

buildSrc/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     runtime 'io.opencensus:opencensus-impl:0.18.0'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
     implementation 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17-g008'
-    implementation 'com.android.tools.build:gradle:3.6.2'
+    implementation 'com.android.tools.build:gradle:3.4.2'
 
     testImplementation 'junit:junit:4.13-rc-1'
     testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'

firebase-crashlytics-ndk/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 17.1.0
+
+- [changed] Updated `firebase-crashlytics` dependency to v17.1.0.
+
+# 17.0.1
+
+- [changed] Updated `firebase-crashlytics` dependency to v17.0.1.
+
+# 17.0.0
+
+- [changed] The Firebase Crashlytics SDK for NDK is now generally
+  available.
+
+- [changed] Updated `firebase-crashlytics` dependency to v17.0.0.
+
 # 17.0.0-beta04
 
 - [changed] Updated `firebase-crashlytics` dependency to v17.0.0-beta-04.

firebase-crashlytics-ndk/README.md

@@ -13,11 +13,9 @@ In addition, **this project requires NDK version r17c to build.**
 
 ### Setting up NDK r17c
 
-1. Download the appropriate zip for your build environment
-[here](https://developer.android.com/ndk/downloads/older_releases.html).
-2. Unzip the package into an accessible directory.
-3. In your `local.properties` file in the root of this project, add
-`ndk.dir=/path/to/android-ndk-r17c` with the path to the unzipped package.
+1. Follow the instructions
+[here](https://developer.android.com/studio/projects/install-ndk#specific-version)
+to install NDK version 17.2.4988734.
 
 ## Building
 

firebase-crashlytics-ndk/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.2
-latestReleasedVersion=17.0.1
+version=17.1.1
+latestReleasedVersion=17.1.0

firebase-crashlytics/CHANGELOG.md

@@ -1,3 +1,32 @@
+# 17.1.0
+
+- [fixed] Updated Crashlytics integration with Firebase Analytics to
+  include native crashes in crash-free users counts.
+
+- [fixed] Removed a harmless, yet unexpected `FileNotFoundException` log
+  output that printed when an optional file is unavailable.
+  ([Github Issue #1559](//github.com/firebase/firebase-android-sdk/issues/1559#issuecomment-638387614))
+
+# 17.0.1
+
+- [fixed] Fixed an issue causing a `SQLiteException` when changing versions
+  of Crashlytics.
+  ([Github Issue #1531](https://github.com/firebase/firebase-android-sdk/issues/1531))
+
+- [fixed] Improved reliability of sending reports at crash time on Android API
+  level 28+.
+
+# 17.0.0
+
+- [changed] The Firebase Crashlytics SDK is now generally available.
+
+- [fixed] Fixed an issue that could cause apps to crash if a crash report
+  payload is too large (rare).
+
+- [changed] Updated dependency on the Firebase Instance ID library to v20.1.5,
+  which is a step towards a direct dependency on the Firebase Installations
+  service in a future release.
+
 # 17.0.0-beta04
 
 - [changed] Imposed a limit on the maximum crash report payload size.

firebase-crashlytics/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.2
-latestReleasedVersion=17.0.1
+version=17.1.1
+latestReleasedVersion=17.1.0

firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTest.java

@@ -25,6 +25,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.emulators.EmulatedServiceSettings;
 import com.google.firebase.functions.FirebaseFunctionsException.Code;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,6 +40,8 @@
 public class CallTest {
   private static FirebaseApp app;
 
+  private static final EmulatedServiceSettings NO_EMULATOR = null;
+
   @BeforeClass
   public static void setUp() {
     FirebaseApp.initializeApp(InstrumentationRegistry.getContext());
@@ -90,7 +93,8 @@ public void testToken() throws InterruptedException, ExecutionException {
             () -> {
               HttpsCallableContext context = new HttpsCallableContext("token", null);
               return Tasks.forResult(context);
-            });
+            },
+            NO_EMULATOR);
 
     HttpsCallableReference function = functions.getHttpsCallable("tokenTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());
@@ -110,7 +114,8 @@ public void testInstanceId() throws InterruptedException, ExecutionException {
             () -> {
               HttpsCallableContext context = new HttpsCallableContext(null, "iid");
               return Tasks.forResult(context);
-            });
+            },
+            NO_EMULATOR);
 
     HttpsCallableReference function = functions.getHttpsCallable("instanceIdTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());

firebase-functions/src/androidTest/java/com/google/firebase/functions/FirebaseFunctionsTest.java

@@ -15,32 +15,24 @@
 package com.google.firebase.functions;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.emulators.EmulatedServiceSettings;
+import com.google.firebase.emulators.EmulatorSettings;
 import java.net.URL;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class FirebaseFunctionsTest {
-  private final FirebaseApp app = mock(FirebaseApp.class);
-  private final ContextProvider provider = mock(ContextProvider.class);
-
-  @Before
-  public void setUp() {
-    when(app.get(FunctionsMultiResourceComponent.class))
-        .thenReturn(
-            new FunctionsMultiResourceComponent(
-                InstrumentationRegistry.getTargetContext(), provider, "my-project"));
-  }
 
   @Test
   public void testGetUrl() {
+    FirebaseApp app = getApp("testGetUrl");
+
     FirebaseFunctions functions = FirebaseFunctions.getInstance(app, "my-region");
     URL url = functions.getURL("my-endpoint");
     assertEquals("https://my-region-my-project.cloudfunctions.net/my-endpoint", url.toString());
@@ -49,4 +41,52 @@ public void testGetUrl() {
     url = functions.getURL("my-endpoint");
     assertEquals("https://us-central1-my-project.cloudfunctions.net/my-endpoint", url.toString());
   }
+
+  @Test
+  public void testGetUrl_withEmulator() {
+    FirebaseApp app = getApp("testGetUrl_withEmulator");
+
+    app.enableEmulators(
+        new EmulatorSettings.Builder()
+            .addEmulatedService(
+                FirebaseFunctions.EMULATOR, new EmulatedServiceSettings("10.0.2.2", 5001))
+            .build());
+
+    URL withRegion = FirebaseFunctions.getInstance(app, "my-region").getURL("my-endpoint");
+    assertEquals("http://10.0.2.2:5001/my-project/my-region/my-endpoint", withRegion.toString());
+
+    URL withoutRegion = FirebaseFunctions.getInstance(app).getURL("my-endpoint");
+    assertEquals(
+        "http://10.0.2.2:5001/my-project/us-central1/my-endpoint", withoutRegion.toString());
+  }
+
+  @Test
+  public void testGetUrl_withEmulator_matchesOldImpl() {
+    FirebaseApp app = getApp("testGetUrl_withEmulator_matchesOldImpl");
+
+    app.enableEmulators(
+        new EmulatorSettings.Builder()
+            .addEmulatedService(
+                FirebaseFunctions.EMULATOR, new EmulatedServiceSettings("10.0.2.2", 5001))
+            .build());
+
+    FirebaseFunctions functions = FirebaseFunctions.getInstance(app);
+    URL newImplUrl = functions.getURL("my-endpoint");
+
+    functions.useFunctionsEmulator("http://10.0.2.2:5001");
+    URL oldImplUrl = functions.getURL("my-endpoint");
+
+    assertEquals(newImplUrl.toString(), oldImplUrl.toString());
+  }
+
+  private FirebaseApp getApp(String name) {
+    return FirebaseApp.initializeApp(
+        InstrumentationRegistry.getInstrumentation().getTargetContext(),
+        new FirebaseOptions.Builder()
+            .setProjectId("my-project")
+            .setApplicationId("appid")
+            .setApiKey("apikey")
+            .build(),
+        name);
+  }
 }

firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java

@@ -27,6 +27,8 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.emulators.EmulatedServiceSettings;
+import com.google.firebase.emulators.FirebaseEmulator;
 import com.google.firebase.functions.FirebaseFunctionsException.Code;
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -47,6 +49,17 @@
 /** FirebaseFunctions lets you call Cloud Functions for Firebase. */
 public class FirebaseFunctions {
 
+  /**
+   * Emulator identifier, see {@link
+   * com.google.firebase.emulators.EmulatorSettings.Builder#addEmulatedService(FirebaseEmulator,
+   * EmulatedServiceSettings)}
+   *
+   * <p>TODO(samstern): Un-hide this once Firestore, Database, and Functions are implemented
+   *
+   * @hide
+   */
+  public static final FirebaseEmulator EMULATOR = FirebaseEmulator.forName("functions");
+
   /** A task that will be resolved once ProviderInstaller has installed what it needs to. */
   private static final TaskCompletionSource<Void> providerInstalled = new TaskCompletionSource<>();
 
@@ -75,13 +88,26 @@ public class FirebaseFunctions {
   private String urlFormat = "https://%1$s-%2$s.cloudfunctions.net/%3$s";
 
   FirebaseFunctions(
-      Context context, String projectId, String region, ContextProvider contextProvider) {
+      Context context,
+      String projectId,
+      String region,
+      ContextProvider contextProvider,
+      @Nullable EmulatedServiceSettings emulatorSettings) {
     this.client = new OkHttpClient();
     this.serializer = new Serializer();
     this.contextProvider = Preconditions.checkNotNull(contextProvider);
     this.projectId = Preconditions.checkNotNull(projectId);
     this.region = Preconditions.checkNotNull(region);
 
+    if (emulatorSettings != null) {
+      urlFormat =
+          "http://"
+              + emulatorSettings.getHost()
+              + ":"
+              + emulatorSettings.getPort()
+              + "/%2$s/%1$s/%3$s";
+    }
+
     maybeInstallProviders(context);
   }
 

firebase-functions/src/main/java/com/google/firebase/functions/FunctionsMultiResourceComponent.java

@@ -16,6 +16,8 @@
 
 import android.content.Context;
 import androidx.annotation.GuardedBy;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.emulators.EmulatedServiceSettings;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,19 +33,25 @@ class FunctionsMultiResourceComponent {
 
   private final Context applicationContext;
   private final ContextProvider contextProvider;
-  private final String projectId;
+  private final FirebaseApp app;
 
   FunctionsMultiResourceComponent(
-      Context applicationContext, ContextProvider contextProvider, String projectId) {
+      Context applicationContext, ContextProvider contextProvider, FirebaseApp app) {
     this.applicationContext = applicationContext;
     this.contextProvider = contextProvider;
-    this.projectId = projectId;
+    this.app = app;
   }
 
   synchronized FirebaseFunctions get(String region) {
     FirebaseFunctions functions = instances.get(region);
+    String projectId = app.getOptions().getProjectId();
+    EmulatedServiceSettings emulatorSettings =
+        app.getEmulatorSettings().getServiceSettings(FirebaseFunctions.EMULATOR);
+
     if (functions == null) {
-      functions = new FirebaseFunctions(applicationContext, projectId, region, contextProvider);
+      functions =
+          new FirebaseFunctions(
+              applicationContext, projectId, region, contextProvider, emulatorSettings);
       instances.put(region, functions);
     }
     return functions;

firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java

@@ -16,7 +16,7 @@
 
 import android.content.Context;
 import androidx.annotation.Keep;
-import com.google.firebase.FirebaseOptions;
+import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
@@ -48,13 +48,13 @@ public List<Component<?>> getComponents() {
         Component.builder(FunctionsMultiResourceComponent.class)
             .add(Dependency.required(Context.class))
             .add(Dependency.required(ContextProvider.class))
-            .add(Dependency.required(FirebaseOptions.class))
+            .add(Dependency.required(FirebaseApp.class))
             .factory(
                 c ->
                     new FunctionsMultiResourceComponent(
                         c.get(Context.class),
                         c.get(ContextProvider.class),
-                        c.get(FirebaseOptions.class).getProjectId()))
+                        c.get(FirebaseApp.class)))
             .build(),
         LibraryVersionComponent.create("fire-fn", BuildConfig.VERSION_NAME));
   }