Merge branch 'master' into rl.update-android-gradle

Author: rlazo

.gitignore

@@ -5,6 +5,6 @@ build/
 captures/
 local.properties
 google-services.json
-/build.gradle
 _artifacts
 .DS_Store
+firebase-crashlytics-ndk/.externalNativeBuild/

.idea/runConfigurations/Firestore_Unit_Tests.xml

@@ -8,6 +8,7 @@
     "pages": {
         "README.md": "Development Guide",
         "docs/ktx/common.md": "Common KTX",
+        "docs/ktx/dynamic-links.md": "Dynamic Links KTX",
         "docs/ktx/firestore.md": "Firestore KTX",
         "docs/ktx/functions.md": "Functions KTX",
         "docs/ktx/inappmessaging.md": "In-App Messaging KTX",

.opensource/project.json

@@ -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

README.md

@@ -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/apk-size.gradle

@@ -12,12 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.gradle.plugins.ci
+apply plugin: "com.android.application"
+apply from: "default.gradle"
+android {
+    flavorDimensions "apkSize"
 
-import java.util.regex.Pattern
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
 
-/** Contains plugin configuration properties. */
-class ContinuousIntegrationExtension {
-    /** List of paths that the plugin should ignore when querying the Git commit. */
-    List<Pattern> ignorePaths = []
-}
+apply from: "src/base/base.gradle"
+apply from: "configure.gradle"

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationExtension.groovy renamed to apk-size/app/build.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)
+        }
+    }
+}

apk-size/app/configure.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/default.gradle renamed to apk-size/app/default.gradle

@@ -15,7 +15,7 @@
 import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
 
 buildscript {
-    ext.kotlinVersion = '1.3.50'
+    ext.kotlinVersion = '1.3.72'
     repositories {
         google()
         jcenter()
@@ -43,21 +43,19 @@ 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.ci.CheckCoveragePlugin
 
 firebaseContinuousIntegration {
     ignorePaths = [
@@ -66,18 +64,17 @@ firebaseContinuousIntegration {
     ]
 }
 
+if(JavaVersion.current() != JavaVersion.VERSION_11){
+    throw new GradleException("This build must be run with java 11. You're using ${JavaVersion.current()}.")
+}
+
 configure(subprojects) {
     repositories {
         google()
         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 +96,6 @@ configure(subprojects) {
         exclude '**/package-info.java'
     }
 
-    tasks.withType(JavaCompile) {
-        options.errorprone.excludedPaths = '.*/build/generated/.*'
-    }
-
     apply plugin: "org.jlleitschuh.gradle.ktlint"
 }
 

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

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 plugins {
-    id 'java-gradle-plugin'
-    id 'groovy'
+    id "org.gradle.kotlin.kotlin-dsl" version "1.2.6"
+    id "org.jlleitschuh.gradle.ktlint" version "9.2.1"
 }
 
 repositories {
@@ -42,12 +42,10 @@ dependencies {
     implementation 'digital.wup:android-maven-publish:3.6.2'
     implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20'
     implementation 'org.json:json:20180813'
-
     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 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17-g005'
 
     implementation 'com.android.tools.build:gradle:3.5.2'
@@ -57,6 +55,9 @@ dependencies {
         exclude group: 'org.codehaus.groovy'
     }
 
+    testImplementation 'junit:junit:4.13-rc-1'
+    testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
+    testImplementation "com.google.truth:truth:1.0.1"
     testImplementation 'commons-io:commons-io:2.6'
 
 }