Merge

Author: schmidt-sebastian

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryExtension.java

@@ -16,6 +16,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.firebase.gradle.plugins.ci.device.FirebaseTestLabExtension;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -39,7 +40,7 @@ public class FirebaseLibraryExtension {
   public boolean publishSources;
 
   /** Static analysis configuration. */
-  public final FirebaseStaticAnalysis staticAnalysis = new FirebaseStaticAnalysis();
+  public final FirebaseStaticAnalysis staticAnalysis;
 
   /** Firebase Test Lab configuration/ */
   public final FirebaseTestLabExtension testLab;
@@ -78,6 +79,20 @@ public FirebaseLibraryExtension(Project project) {
       artifactId.set(new DefaultProvider<>(project::getName));
       groupId.set(new DefaultProvider<>(() -> project.getGroup().toString()));
     }
+    this.staticAnalysis = initializeStaticAnalysis(project);
+  }
+
+  private FirebaseStaticAnalysis initializeStaticAnalysis(Project project) {
+    return new FirebaseStaticAnalysis(
+        projectsFromProperty(project, "firebase.checks.errorproneProjects"),
+        projectsFromProperty(project, "firebase.checks.lintProjects"));
+  }
+
+  private Set<String> projectsFromProperty(Project project, String propertyName) {
+    if (!project.hasProperty(propertyName)) {
+      return Collections.emptySet();
+    }
+    return ImmutableSet.copyOf(project.property(propertyName).toString().split(",", -1));
   }
 
   /** Configure Firebase Test Lab. */

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java

@@ -17,23 +17,13 @@
 import com.android.build.gradle.LibraryExtension;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
 
-import java.util.Set;
-
 public class FirebaseLibraryPlugin implements Plugin<Project> {
 
-  private static final Set<String> KOTLIN_CHECKS =
-      ImmutableSet.of(
-          "FirebaseNoHardKeywords",
-          "FirebaseLambdaLast",
-          "FirebaseUnknownNullness",
-          "FirebaseKotlinPropertyAccess");
-
   @Override
   public void apply(Project project) {
     project.apply(ImmutableMap.of("plugin", "com.android.library"));
@@ -106,11 +96,6 @@ private static void setupStaticAnalysis(
                       }
                     }));
 
-    library.staticAnalysis.subscribeToKotlinInteropLintDisabled(
-        () ->
-            android.lintOptions(
-                lintOptions -> lintOptions.disable(KOTLIN_CHECKS.toArray(new String[0]))));
-
     project.getTasks().register("firebaseLint", task -> task.dependsOn("lint"));
   }
 

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseStaticAnalysis.java

@@ -14,45 +14,15 @@
 
 package com.google.firebase.gradle.plugins;
 
-import com.google.common.collect.ImmutableSet;
-
-import java.util.HashSet;
 import java.util.Set;
-import java.util.function.Consumer;
 
 public class FirebaseStaticAnalysis {
   public Set<String> errorproneCheckProjects;
   public Set<String> androidLintCheckProjects;
 
-
-  private boolean disableKotlinInteropLint;
-
-  private final Set<Runnable> kotlinInteropLintDisabledSubscribers = new HashSet<>();
-
-  public FirebaseStaticAnalysis() {
-    this(ImmutableSet.of(":tools:errorprone"), ImmutableSet.of(":tools:lint"));
-  }
-
-  public FirebaseStaticAnalysis(Set<String> errorproneCheckProjects, Set<String> androidLintCheckProjects) {
+  public FirebaseStaticAnalysis(
+      Set<String> errorproneCheckProjects, Set<String> androidLintCheckProjects) {
     this.errorproneCheckProjects = errorproneCheckProjects;
     this.androidLintCheckProjects = androidLintCheckProjects;
   }
-
-  /** Indicates whether Kotlin Interop Lint checks are enabled for public APIs of the library. */
-  public void disableKotlinInteropLint() {
-    if (disableKotlinInteropLint) {
-      return;
-    }
-    disableKotlinInteropLint = true;
-    for (Runnable subscription : kotlinInteropLintDisabledSubscribers) {
-      subscription.run();
-    }
-  }
-
-  void subscribeToKotlinInteropLintDisabled(Runnable subscription) {
-    this.kotlinInteropLintDisabledSubscribers.add(subscription);
-    if (disableKotlinInteropLint) {
-      subscription.run();
-    }
-  }
 }

buildSrc/src/test/groovy/com/google/firebase/gradle/plugins/publish/PublishingPluginSpec.groovy

@@ -29,12 +29,6 @@ class PublishingPluginSpec extends Specification {
         plugins {
             id 'firebase-library'
         }
-        firebaseLibrary {
-          staticAnalysis {
-            errorproneCheckProjects = []
-            androidLintCheckProjects = []
-          }
-        }
         group = '${group}'
         version = '${version}'
         <% if (latestReleasedVersion) println "ext.latestReleasedVersion = $latestReleasedVersion" %>

firebase-common/firebase-common.gradle

@@ -64,6 +64,9 @@ dependencies {
     api 'com.google.auto.value:auto-value-annotations:1.6.5'
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
+    // needed for Kotlin detection to compile, but not necessarily present at runtime.
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.ext:junit:1.1.1'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"

firebase-common/ktx/ktx.gradle

@@ -27,7 +27,6 @@ android {
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         versionName version
-        buildConfigField('String', 'KOTLIN_VERSION', "\"$kotlinVersion\"")
     }
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

firebase-common/ktx/src/main/kotlin/com/google/firebase/ktx/Firebase.kt

@@ -57,7 +57,6 @@ internal const val LIBRARY_NAME: String = "fire-core-ktx"
 class FirebaseCommonKtxRegistrar : ComponentRegistrar {
     override fun getComponents(): List<Component<*>> {
         return listOf(
-                LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME),
-                LibraryVersionComponent.create("kotlin", BuildConfig.KOTLIN_VERSION))
+                LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME))
     }
 }

firebase-common/proguard.txt

@@ -1,3 +1,4 @@
 -dontwarn com.google.firebase.components.Component$Instantiation
 -dontwarn com.google.firebase.components.Component$ComponentType
+-dontwarn com.google.firebase.platforminfo.KotlinDetector
 -keep class * implements com.google.firebase.components.ComponentRegistrar

firebase-common/src/main/java/com/google/firebase/FirebaseApp.java

@@ -46,6 +46,7 @@
 import com.google.firebase.events.Publisher;
 import com.google.firebase.internal.DataCollectionConfigStorage;
 import com.google.firebase.platforminfo.DefaultUserAgentPublisher;
+import com.google.firebase.platforminfo.KotlinDetector;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -100,6 +101,7 @@ public class FirebaseApp {
 
   private static final String FIREBASE_ANDROID = "fire-android";
   private static final String FIREBASE_COMMON = "fire-core";
+  private static final String KOTLIN = "kotlin";
 
   private final Context applicationContext;
   private final String name;
@@ -397,6 +399,8 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
 
     List<ComponentRegistrar> registrars =
         ComponentDiscovery.forContext(applicationContext).discover();
+
+    String kotlinVersion = KotlinDetector.detectVersion();
     componentRuntime =
         new ComponentRuntime(
             UI_EXECUTOR,
@@ -406,7 +410,9 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
             Component.of(options, FirebaseOptions.class),
             LibraryVersionComponent.create(FIREBASE_ANDROID, ""),
             LibraryVersionComponent.create(FIREBASE_COMMON, BuildConfig.VERSION_NAME),
+            kotlinVersion != null ? LibraryVersionComponent.create(KOTLIN, kotlinVersion) : null,
             DefaultUserAgentPublisher.component());
+
     dataCollectionConfigStorage =
         new Lazy<>(
             () ->

firebase-common/src/main/java/com/google/firebase/components/ComponentRuntime.java

@@ -55,7 +55,11 @@ public ComponentRuntime(
     for (ComponentRegistrar registrar : registrars) {
       componentsToAdd.addAll(registrar.getComponents());
     }
-    Collections.addAll(componentsToAdd, additionalComponents);
+    for (Component<?> additionalComponent : additionalComponents) {
+      if (additionalComponent != null) {
+        componentsToAdd.add(additionalComponent);
+      }
+    }
 
     CycleDetector.detect(componentsToAdd);
 

firebase-common/src/main/java/com/google/firebase/platforminfo/KotlinDetector.java

@@ -0,0 +1,36 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.platforminfo;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Detects presence of Kotlin stdlib on the classpath.
+ *
+ * <p>If it is present, it is inferred that the application or its subset is written in Kotlin.
+ */
+public final class KotlinDetector {
+  private KotlinDetector() {}
+
+  /** Returns the version of Kotlin stdlib if found, {@code null} otherwise. */
+  @Nullable
+  public static String detectVersion() {
+    try {
+      return kotlin.KotlinVersion.CURRENT.toString();
+    } catch (NoClassDefFoundError ex) {
+      return null;
+    }
+  }
+}

firebase-database/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 19.1.0
+- [feature] Added support for the Firebase Database Emulator. To connect to
+  the emulator, specify "http://<emulatorHost>/?ns=<projectId>" as your
+  Database URL (via `FirebaseDatabase.getInstance(String)`).
+  Note that if you are running the Database Emulator on "localhost" and
+  connecting from an app that is running inside an Android Emulator, the
+  emulator host will be "10.0.2.2" followed by its port.
+
 # 18.0.1
 - [changed] The SDK now reports the correct version number (via
   `FirebaseDatabase.getSdkVersion()`).

firebase-database/src/androidTest/java/com/google/firebase/database/DataTest.java

@@ -1081,9 +1081,9 @@ public void urlEncodingAndDecodingWorks()
         new DatabaseReference(
             IntegrationTestValues.getNamespace() + "/a%b&c@d/space: /non-ascii:ø", ctx);
     String result = ref.toString();
-    String expected =
+    String encoded =
         IntegrationTestValues.getNamespace() + "/a%25b%26c%40d/space%3A%20/non-ascii%3A%C3%B8";
-    assertEquals(expected, result);
+    assertEquals(encoded, result);
 
     String child = "" + new Random().nextInt(100000000);
     new WriteFuture(ref.child(child), "testdata").timedGet();

firebase-database/src/androidTest/java/com/google/firebase/database/FirebaseDatabaseTest.java

@@ -170,7 +170,7 @@ public void persistenceSettings() {
     config.setPersistenceCacheSizeBytes(1 * 1024 * 1024);
 
     try {
-      FirebaseDatabase db = new DatabaseReference("", config).getDatabase();
+      FirebaseDatabase db = new DatabaseReference("http://localhost", config).getDatabase();
       db.setPersistenceCacheSizeBytes(1 * 1024 * 1024);
       fail("should throw - can't modify after init");
     } catch (DatabaseException e) {

firebase-database/src/androidTest/java/com/google/firebase/database/RealtimeTest.java

@@ -23,8 +23,6 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.database.core.DatabaseConfig;
 import com.google.firebase.database.core.RepoManager;
-import com.google.firebase.database.core.utilities.ParsedUrl;
-import com.google.firebase.database.core.utilities.Utilities;
 import com.google.firebase.database.future.ReadFuture;
 import com.google.firebase.database.future.WriteFuture;
 import java.util.List;
@@ -48,21 +46,6 @@ public void tearDown() {
     IntegrationTestHelpers.failOnFirstUncaughtException();
   }
 
-  @Test
-  public void testUrlParsing() throws DatabaseException {
-    ParsedUrl parsed = Utilities.parseUrl("http://gsoltis.fblocal.com:9000");
-    assertEquals(parsed.path.toString(), "/");
-    assertEquals(parsed.repoInfo.host, "gsoltis.fblocal.com:9000");
-    assertEquals(parsed.repoInfo.internalHost, "gsoltis.fblocal.com:9000");
-    assertEquals(parsed.repoInfo.secure, false);
-
-    parsed = Utilities.parseUrl("http://gsoltis.firebaseio.com/foo/bar");
-    assertEquals(parsed.path.toString(), "/foo/bar");
-    assertEquals(parsed.repoInfo.host, "gsoltis.firebaseio.com");
-    assertEquals(parsed.repoInfo.internalHost, "gsoltis.firebaseio.com");
-    assertEquals(parsed.repoInfo.secure, true);
-  }
-
   @Test
   public void testOnDisconnectSetWorks()
       throws DatabaseException, TestFailure, TimeoutException, InterruptedException {

firebase-database/src/main/java/com/google/firebase/database/core/utilities/DefaultRunLoop.java

@@ -128,13 +128,20 @@ public static String messageForException(Throwable t) {
           + "https://firebase.google.com/docs/database/ios/structure-data#best_practices_for_data_structure"
           + " and "
           + "https://firebase.google.com/docs/database/android/retrieve-data#filtering_data";
+    } else if (t instanceof NoClassDefFoundError) {
+      return "A symbol that the Firebase Database SDK depends on failed to load. This usually "
+          + "indicates that your project includes an incompatible version of another Firebase "
+          + "dependency. If updating your dependencies to the latest version does not resolve "
+          + "this issue, please file a report at https://github.com/firebase/firebase-android-sdk";
     } else if (t instanceof DatabaseException) {
       // Exception should be self-explanatory and they shouldn't contact support.
       return "";
     } else {
       return "Uncaught exception in Firebase Database runloop ("
           + FirebaseDatabase.getSdkVersion()
-          + "). Please report to [email protected]";
+          + "). If you are not already on the latest version of the Firebase SDKs, try updating "
+          + "your dependencies. Should this problem persist, please file a report at "
+          + "https://github.com/firebase/firebase-android-sdk";
     }
   }
 }

firebase-database/src/main/java/com/google/firebase/database/core/utilities/ParsedUrl.java

@@ -21,4 +21,15 @@ public class ParsedUrl {
 
   public RepoInfo repoInfo;
   public Path path;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    ParsedUrl parsedUrl = (ParsedUrl) o;
+
+    if (!repoInfo.equals(parsedUrl.repoInfo)) return false;
+    return path.equals(parsedUrl.path);
+  }
 }