Merge branch 'master' into davidmotson.crashlytics_dynamic_module

Author: David Motsonashvili

alternative-root-project.gradle

@@ -34,10 +34,8 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.4.3'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.2.1'
-        classpath 'org.jsoup:jsoup:1.11.2'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8'
         classpath 'com.google.gms:google-services:4.3.0'
-        classpath 'me.tatarka:gradle-retrolambda:3.7.1'
         classpath 'digital.wup:android-maven-publish:3.6.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'org.jlleitschuh.gradle:ktlint-gradle:7.1.0'

build.gradle

@@ -31,10 +31,8 @@ buildscript {
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
-        classpath 'org.jsoup:jsoup:1.13.1'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'me.tatarka:gradle-retrolambda:3.7.1'
         classpath 'digital.wup:android-maven-publish:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
@@ -57,7 +55,6 @@ ext {
 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
 
 firebaseContinuousIntegration {
     ignorePaths = [
@@ -106,10 +103,7 @@ configure(subprojects) {
 
 
 /**
- * Configure "Preguarding" and Desugaring for the subprojects.
- *
- * <p>Desugaring is enabled with the 'me.tatarka:gradle-retrolambda' plugin as the built-in Android
- * desugaring is not supported for libraries.
+ * Configure "Preguarding" for the subprojects.
  *
  * <p> The way it works is every library subproject that has the android plugin applied and:
  *
@@ -128,9 +122,6 @@ configure(subprojects) {
             return
         }
 
-        // Apply the retrolambda plugin
-        sub.apply plugin: 'me.tatarka.retrolambda'
-
         boolean skipPreguard = sub.getProperties().getOrDefault('firebaseSkipPreguard', 'true').toBoolean()
         def defaultPreguard = rootProject.getProperties().getOrDefault('firebaseDefaultPreguardFile', 'default-preguard.txt')
 

buildSrc/build.gradle

@@ -39,34 +39,19 @@ def perfPluginVersion = System.getenv("FIREBASE_PERF_PLUGIN_VERSION") ?: "1.3.5"
 googleJavaFormat {
     toolVersion = '1.7'
 }
-tasks.googleJavaFormat {
-    source '.'
-    include '**/java/**/*.java'
-    exclude '**/generated/**'
-    exclude '**/package-info.java'
-}
-
-tasks.verifyGoogleJavaFormat {
-    source '.'
-    include '**/java/**/*.java'
-    exclude '**/generated/**'
-    exclude '**/package-info.java'
-}
 
 dependencies {
     // Firebase performance plugin, it should be added here because of how gradle dependency
     // resolution works, otherwise it breaks Fireperf Test Apps.
     // See https://github.com/gradle/gradle/issues/12286
     implementation "com.google.firebase:perf-plugin:$perfPluginVersion"
 
-    implementation 'org.jsoup:jsoup:1.11.2'
-    implementation "com.google.auto.value:auto-value-annotations:1.6.6"
+    implementation "com.google.auto.value:auto-value-annotations:1.7"
     annotationProcessor "com.google.auto.value:auto-value:1.6.5"
-    implementation 'digital.wup:android-maven-publish:3.6.2'
+    implementation 'digital.wup:android-maven-publish:3.6.3'
     implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
     implementation 'org.json:json:20180813'
-    implementation 'io.opencensus:opencensus-api:0.18.0'
-    implementation 'io.opencensus:opencensus-exporter-stats-stackdriver:0.18.0'
+
     implementation "org.eclipse.aether:aether-api:1.0.0.v20140518"
     implementation "org.eclipse.aether:aether-util:1.0.0.v20140518"
     implementation "org.eclipse.aether:aether-impl:1.0.0.v20140518"
@@ -75,12 +60,12 @@ dependencies {
     implementation "org.eclipse.aether:aether-transport-http:1.0.0.v20140518"
     implementation "org.eclipse.aether:aether-transport-wagon:1.0.0.v20140518"
     implementation "org.apache.maven:maven-aether-provider:3.1.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-g013-9b8280a'
     implementation 'com.android.tools.build:gradle:3.4.3'
 
-    testImplementation 'junit:junit:4.13-rc-1'
+    testImplementation 'junit:junit:4.13.2'
     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'