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

Author: ashwinraghav

README.md

@@ -63,6 +63,12 @@ Firebase Android libraries exercise all three types of tests recommended by the
 Depending on the requirements of the specific project, some or all of these
 tests may be used to support changes.
 
+> :warning: **Running tests with errorprone**
+>
+> To run with errorprone add `withErrorProne` to the command line, e.g.
+>
+> `./gradlew :<firebase-project>:check withErrorProne`.
+
 ### Unit Testing
 
 These are tests that run on your machine's local Java Virtual Machine (JVM). At

apk-size/apk-size.gradle

@@ -0,0 +1,31 @@
+// Copyright 2020 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.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.4.2'
+    }
+}
+
+apply from: '../sdkProperties.gradle'
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

apk-size/app/build.gradle

@@ -0,0 +1,27 @@
+// Copyright 2018 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.
+
+apply plugin: "com.android.application"
+apply from: "default.gradle"
+android {
+    flavorDimensions "apkSize"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+apply from: "src/base/base.gradle"
+apply from: "configure.gradle"

apk-size/app/configure.gradle

@@ -0,0 +1,50 @@
+// Copyright 2020 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.
+
+
+repositories {
+    maven {
+        url '../../build/m2repository/'
+    }
+    google()
+    jcenter()
+}
+
+// firebase-inappmessaging-display fails with `java.lang.OutOfMemoryError (no error message)`
+// in task `:transformDexArchiveWithExternalLibsDexMergerForFirebase-inappmessaging-displayRelease`
+//
+// firebase-inappmessaging-display-ktx fails with `java.lang.OutOfMemoryError: GC overhead limit exceeded`
+// in task `:transformClassesAndResourcesWithR8ForFirebase-inappmessaging-display-ktxAggressive`
+//
+// Setting max heap size to 16g in gradle.properties and android.dexOptions did not help.
+// When running with `gradle --continue`, failing tasks did not timeout. Thus, disable for now.
+// TODO (yifany): Needs further investigation.
+def blacklist = [
+        'firebase-inappmessaging-display',
+        'firebase-inappmessaging-display-ktx'
+]
+if (project.hasProperty('sdks')) {
+    project.android {
+        sdks.split(',').each { sdk ->
+            def (groupId, artifactId, version) = sdk.split(':')
+            if (blacklist.contains(artifactId)) {
+                return
+            }
+            productFlavors.create(artifactId) {
+                dimension 'apkSize'
+            }
+            dependencies.add("${artifactId}Implementation", sdk)
+        }
+    }
+}

tools/measurement/apksize/default.gradle renamed to apk-size/app/default.gradle

@@ -0,0 +1,17 @@
+// Copyright 2020 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.
+
+rootProject.name='apk-size'
+rootProject.buildFileName='apk-size.gradle'
+include ':app'

tools/measurement/apksize/proguard-rules-aggressive.pro renamed to apk-size/app/proguard-rules-aggressive.pro

@@ -43,21 +43,20 @@ buildscript {
 }
 
 apply from: 'sdkProperties.gradle'
+apply from: "gradle/errorProne.gradle"
 
 ext {
     playServicesVersion = '16.0.1'
     supportAnnotationsVersion = '28.0.0'
-    errorproneVersion = '2.3.2'
-    errorproneJavacVersion = '9+181-r4173-1'
     googleTruthVersion = '0.45'
-    robolectricVersion = '4.1'
+    robolectricVersion = '4.3.1'
 }
 
 apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin
 apply plugin: com.google.firebase.gradle.plugins.ci.ContinuousIntegrationPlugin
 apply plugin: com.google.firebase.gradle.plugins.ci.SmokeTestsPlugin
 apply plugin: com.google.firebase.gradle.plugins.ci.metrics.MetricsPlugin
-apply plugin: com.google.firebase.gradle.plugins.measurement.coverage.CheckCoveragePlugin
+apply plugin: com.google.firebase.gradle.plugins.ci.CheckCoveragePlugin
 
 firebaseContinuousIntegration {
     ignorePaths = [
@@ -72,12 +71,7 @@ configure(subprojects) {
         jcenter()
         mavenLocal()
     }
-    apply plugin: 'net.ltgt.errorprone'
-    dependencies {
-        errorprone "com.google.errorprone:error_prone_core:$errorproneVersion"
-        errorproneJavac "com.google.errorprone:javac:$errorproneJavacVersion"
 
-    }
     apply plugin: 'com.github.sherter.google-java-format'
     googleJavaFormat {
         toolVersion = '1.7'
@@ -99,10 +93,6 @@ configure(subprojects) {
         exclude '**/package-info.java'
     }
 
-    tasks.withType(JavaCompile) {
-        options.errorprone.excludedPaths = '.*/build/generated/.*'
-    }
-
     apply plugin: "org.jlleitschuh.gradle.ktlint"
 }
 

tools/measurement/apksize/src/base/base.gradle renamed to apk-size/app/src/base/base.gradle

@@ -0,0 +1,34 @@
+// Copyright 2020 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.gradle.plugins;
+
+import groovy.lang.Closure;
+import java.util.function.Consumer;
+
+public final class ClosureUtil {
+
+  private static final Object FAKE_THIS = new Object();
+
+  private ClosureUtil() {}
+
+  /** Create a groovy closure backed by a lambda. */
+  public static <T> Closure<T> closureOf(Consumer<T> action) {
+    return new Closure<T>(FAKE_THIS) {
+      void doCall(T t) {
+        action.accept(t);
+      }
+    };
+  }
+}

tools/measurement/apksize/src/main/AndroidManifest.xml renamed to apk-size/app/src/main/AndroidManifest.xml

@@ -14,6 +14,8 @@
 
 package com.google.firebase.gradle.plugins;
 
+import static com.google.firebase.gradle.plugins.ClosureUtil.closureOf;
+
 import com.android.build.gradle.LibraryExtension;
 import com.android.build.gradle.api.AndroidSourceSet;
 import com.google.common.collect.ImmutableList;
@@ -51,6 +53,20 @@ public void apply(Project project) {
                 .getByName("release")
                 .setSigningConfig(types.getByName("debug").getSigningConfig()));
 
+    // see https://github.com/robolectric/robolectric/issues/5456
+    android.testOptions(
+        options ->
+            options
+                .getUnitTests()
+                .all(
+                    closureOf(
+                        test -> {
+                          test.systemProperty("robolectric.dependency.repo.id", "central");
+                          test.systemProperty(
+                              "robolectric.dependency.repo.url", "https://repo1.maven.org/maven2");
+                          test.systemProperty("javax.net.ssl.trustStoreType", "JKS");
+                        })));
+
     // skip debug tests in CI
     // TODO(vkryachko): provide ability for teams to control this if needed
     if (System.getenv().containsKey("FIREBASE_CI")) {

tools/measurement/apksize/src/main/java/com.google.apksize/MainActivity.java renamed to apk-size/app/src/main/java/com.google.apksize/MainActivity.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.gradle.plugins.measurement.coverage
+package com.google.firebase.gradle.plugins.ci
 
 import com.google.firebase.gradle.plugins.FirebaseLibraryExtension
 import com.google.firebase.gradle.plugins.FirebaseLibraryPlugin