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

Author: diwu-arete

.opensource/project.json

@@ -8,7 +8,13 @@
     "pages": {
         "README.md": "Development Guide",
         "docs/ktx/common.md": "Common KTX",
-        "docs/ktx/firestore.md": "Firestore KTX"
+        "docs/ktx/firestore.md": "Firestore KTX",
+        "docs/ktx/functions.md": "Functions KTX",
+        "docs/ktx/inappmessaging.md": "In-App Messaging KTX",
+        "docs/ktx/inappmessaging-display.md": "In-App Messaging Display KTX",
+        "docs/ktx/remote-config.md": "Remote Config KTX",
+        "docs/ktx/storage.md": "Storage KTX",
+        "docs/ktx/database.md": "Realtime Database KTX"
     },
     "related": [
         "firebase/quickstart-android"
@@ -23,4 +29,4 @@
             "href": "https://firebase.github.io/firebase-android-sdk/reference/kotlin/firebase-ktx/"
         }
     ]
-}
+}

README.md

@@ -8,16 +8,22 @@ dependencies:
   * `firebase-common`
   * `firebase-common-ktx`
   * `firebase-database`
+  * `firebase-database-ktx`
   * `firebase-database-collection`
   * `firebase-datatransport`
   * `firebase-firestore`
   * `firebase-firestore-ktx`
   * `firebase-functions`
   * `firebase-functions-ktx`
+  * `firebase-inappmessaging`
+  * `firebase-inappmessaging-ktx`
   * `firebase-inappmessaging-display`
+  * `firebase-inappmessaging-display-ktx`
   * `firebase-remote-config`
+  * `firebase-remote-config-ktx`
   * `firebase-storage`
-  
+  * `firebase-storage-ktx`
+
 
 Firebase is an app development platform with tools to help you build, grow and
 monetize your app. More information about Firebase can be found at

buildSrc/$project.buildDir/generated/third_party_licenses/third_party_licenses.json

@@ -0,0 +1 @@
+{"customLib1":{"length":15,"start":11}}

buildSrc/$project.buildDir/generated/third_party_licenses/third_party_licenses.txt

@@ -0,0 +1,3 @@
+customLib1:
+Test license
+

buildSrc/build.gradle

@@ -42,9 +42,11 @@ dependencies {
     implementation 'io.opencensus:opencensus-api:0.18.0'
     implementation 'io.opencensus:opencensus-exporter-stats-stackdriver:0.18.0'
     runtime 'io.opencensus:opencensus-impl:0.18.0'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
 
     implementation 'com.android.tools.build:gradle:3.4.1'
     testImplementation 'junit:junit:4.12'
+    testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
     testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') {
         exclude group: 'org.codehaus.groovy'
     }

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

@@ -15,25 +15,22 @@
 package com.google.firebase.gradle.plugins;
 
 import com.android.build.gradle.LibraryExtension;
+import com.android.build.gradle.api.AndroidSourceSet;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import com.google.firebase.gradle.plugins.apiinfo.ApiInformationTask;
+import com.google.firebase.gradle.plugins.apiinfo.GenerateApiTxtFileTask;
+import com.google.firebase.gradle.plugins.apiinfo.GenerateStubsTask;
+import com.google.firebase.gradle.plugins.apiinfo.GetMetalavaJarTask;
 import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer;
+import java.io.File;
+import java.nio.file.Paths;
 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"));
@@ -65,6 +62,8 @@ public void apply(Project project) {
               });
     }
 
+    setupApiInformationAnalysis(project, android);
+
     android.testServer(new FirebaseTestServer(project, firebaseLibrary.testLab));
 
     setupStaticAnalysis(project, android, firebaseLibrary);
@@ -81,6 +80,79 @@ public void apply(Project project) {
                         ImmutableList.of("-module-name", kotlinModuleName(project))));
   }
 
+  private static void setupApiInformationAnalysis(Project project, LibraryExtension android) {
+    File metalavaOutputJarFile = new File(project.getRootProject().getBuildDir(), "metalava.jar");
+    AndroidSourceSet mainSourceSet = android.getSourceSets().getByName("main");
+    File outputFile =
+        project
+            .getRootProject()
+            .file(
+                Paths.get(
+                    project.getRootProject().getBuildDir().getPath(),
+                    "apiinfo",
+                    project.getPath().substring(1).replace(":", "_")));
+    File outputApiFile = new File(outputFile.getAbsolutePath() + "_api.txt");
+
+    project
+        .getTasks()
+        .register(
+            "getMetalavaJar",
+            GetMetalavaJarTask.class,
+            task -> {
+              task.setOutputFile(metalavaOutputJarFile);
+            });
+    project
+        .getTasks()
+        .register(
+            "apiInformation",
+            ApiInformationTask.class,
+            task -> {
+              task.setApiTxt(project.file("api.txt"));
+              task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
+              task.setSourceSet(mainSourceSet);
+              task.setOutputFile(outputFile);
+              task.setBaselineFile(project.file("baseline.txt"));
+              task.setOutputApiFile(outputApiFile);
+              if (project.hasProperty("updateBaseline")) {
+                task.setUpdateBaseline(true);
+              } else {
+                task.setUpdateBaseline(false);
+              }
+              task.dependsOn("getMetalavaJar");
+            });
+
+    project
+        .getTasks()
+        .register(
+            "generateApiTxtFile",
+            GenerateApiTxtFileTask.class,
+            task -> {
+              task.setApiTxt(project.file("api.txt"));
+              task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
+              task.setSourceSet(mainSourceSet);
+              task.setBaselineFile(project.file("baseline.txt"));
+              if (project.hasProperty("updateBaseline")) {
+                task.setUpdateBaseline(true);
+              } else {
+                task.setUpdateBaseline(false);
+              }
+              task.dependsOn("getMetalavaJar");
+            });
+
+    project
+        .getTasks()
+        .register(
+            "docStubs",
+            GenerateStubsTask.class,
+            task -> {
+              task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
+              task.setOutputDir(new File(project.getBuildDir(), "doc-stubs"));
+              task.dependsOn("getMetalavaJar");
+
+              task.setSourceSet(mainSourceSet);
+            });
+  }
+
   private static void setupStaticAnalysis(
       Project project, LibraryExtension android, FirebaseLibraryExtension library) {
     project.afterEvaluate(
@@ -106,11 +178,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();
-    }
-  }
 }