Various changes due to Ashwin's comments

Author: allisonbm92

buildSrc/src/main/groovy/com/google/firebase/gradle/GenerateMeasurementsTask.groovy

@@ -36,12 +36,20 @@ public class GenerateMeasurementsTask extends DefaultTask {
      * The file storing the SDK map.
      *
      * <p>This may be any type recognized by Gradle as a file. The format of the file's contents is
-     * headerless CSVwith a colon as a delimiter: projectName_buildVariant:sdkId. The first column
-     * contains both the project name and build variant separated by an hyphen, {@code
-     * firestore-aggressive}, for example.
+     * headerless CSV with a colon as a delimiter: projectName-buildVariant:sdkId. The first column
+     * contains both the project name and build variant separated by an hyphen. The SDK ID is the
+     * integer identifier used by the SQL database to represent this SDK and build variant pair.
+     *
+     * <p>A complete example follows:
+     * <pre>{@code
+     * database-debug:1
+     * database-release:2
+     * firestore-release:7
+     * firestore-debug:4
+     *}</pre>
      */
     @InputFile
-    File sdkMap
+    File sdkMapFile
 
     /**
      * The file for storing the report.
@@ -50,7 +58,7 @@ public class GenerateMeasurementsTask extends DefaultTask {
      * overwritten by the new report.
      */
     @OutputFile
-    File report
+    File reportFile
 
     @Override
     Task configure(Closure closure) {
@@ -71,21 +79,25 @@ public class GenerateMeasurementsTask extends DefaultTask {
         def sizes = calculateSizes(sdks, project.android.applicationVariants)
         def report = createReport(sizes)
 
-        project.file(this.report).withWriter {
+        reportFile.withWriter {
             it.write(report)
         }
     }
 
     private def calculateSizes(sdks, variants) {
       def sizes = [:]
 
+      // Each variant should have exactly one APK. If there are multiple APKs, then this file is out
+      // of sync with our Gradle configuration, and this task fails. If an APK is missing, it is
+      // silently ignored, and the APKs from the other variants will be used to build the report.
       variants.each { variant ->
         def name = "${variant.flavorName}-${variant.buildType.name}"
         def apks = variant.outputs.findAll { it.outputFile.name.endsWith(".apk") }
         if (apks.size() > 1) {
             throw new IllegalStateException("${name} produced more than one APK")
         }
 
+        // This runs at most once, as each variant at this point has zero or one APK.
         apks.each {
             def size = it.outputFile.size();
             def sdk = sdks[name];
@@ -168,9 +180,8 @@ public class GenerateMeasurementsTask extends DefaultTask {
 
     private def createSdkMap() {
         def map = [:]
-        def path = project.file(sdkMap)
 
-        path.eachLine {
+        sdkMapFile.eachLine {
             def delimiter = it.indexOf(":")
             def key = it.substring(0, delimiter).trim()
             def value = it.substring(delimiter + 1).trim()

buildSrc/src/main/groovy/com/google/firebase/gradle/UploadMeasurementsTask.groovy

@@ -50,7 +50,7 @@ public class UploadMeasurementsTask extends DefaultTask {
      * provided they run first.
      */
     @InputFile
-    File report
+    File reportFile
 
     @TaskAction
     def upload() {
@@ -72,7 +72,7 @@ public class UploadMeasurementsTask extends DefaultTask {
                     "-jar",
                     jar,
                     "--config_path=${configuration}",
-                    "--proto_path=${report}",
+                    "--proto_path=${reportFile}",
                 )
             }.rethrowFailure()
         }

tools/apksize/apksize.gradle

@@ -42,8 +42,8 @@ apply from: "src/functions/functions.gradle"
  * @param -Ppull_request the pull request number to be included in the report
  */
 task generateMeasurements(type: GenerateMeasurementsTask) {
-    sdkMap = file("sdks.csv")
-    report = file("$buildDir/size-report.textpb")
+    sdkMapFile = file("sdks.csv")
+    reportFile = file("$buildDir/size-report.textpb")
 }
 
 /**
@@ -55,7 +55,7 @@ task generateMeasurements(type: GenerateMeasurementsTask) {
 task uploadMeasurements(type: UploadMeasurementsTask) {
     dependsOn generateMeasurements
 
-    report = file("$buildDir/size-report.textpb")
+    reportFile = file("$buildDir/size-report.textpb")
     uploader = "https://storage.googleapis.com/firebase-engprod-metrics/upload_tool.jar"
 }
 

tools/apksize/default.gradle

@@ -36,15 +36,6 @@ android {
         versionName '1.0'
     }
 
-    signingConfigs {
-        debug {
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-            storeFile file('debug.keystore')
-            storePassword 'android'
-        }
-    }
-
     packagingOptions {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/LICENSE-FIREBASE.txt'

tools/apksize/proguard-rules-aggressive.pro

@@ -1,20 +1 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /usr/local/google/home/askutarenko/Android/Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
--assumenosideeffects public class com.google.android.gms.ads.internal.ClientApi {
-    public static void retainReference(...);
-}
 -dontwarn **