Merge branch 'master' into vk.kotlin_tests

Author: vkryachko

build.gradle

@@ -15,7 +15,7 @@
 import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
 
 buildscript {
-    ext.kotlinVersion = '1.3.61'
+    ext.kotlinVersion = '1.3.72'
     repositories {
         google()
         jcenter()

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/AffectedProjectFinder.java

@@ -69,7 +69,7 @@ Set<Project> find() {
   private static Set<String> changedPaths(File workDir) {
     try {
       Process process =
-          Runtime.getRuntime().exec("git diff --name-only --submodule=diff", null, workDir);
+          Runtime.getRuntime().exec("git diff --name-only --submodule=diff HEAD@{0} HEAD@{1}", null, workDir);
       process.waitFor();
       return ImmutableSet.copyOf(
           CharStreams.readLines(new InputStreamReader(process.getInputStream())));

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/ContinuousIntegrationPlugin.java

@@ -39,7 +39,7 @@ public void apply(Project project) {
           Task connectedCheckDependents = sub.task("connectedCheckDependents");
           Task deviceCheckDependents = sub.task("deviceCheckDependents");
 
-          project
+          sub
               .getConfigurations()
               .all(
                   cfg -> {
@@ -101,9 +101,9 @@ public void apply(Project project) {
     Set<Project> affectedProjects =
         new AffectedProjectFinder(project, extension.getIgnorePaths()).find();
 
-    setupChangedTask(project, affectedProjects, "checkChanged");
-    setupChangedTask(project, affectedProjects, "checkCoverageChanged");
-    setupChangedTask(project, affectedProjects, "deviceCheckChanged");
+    setupChangedTask(project, affectedProjects, "check");
+    setupChangedTask(project, affectedProjects, "checkCoverage");
+    setupChangedTask(project, affectedProjects, "deviceCheck");
   }
 
   private static void setupChangedTask(
@@ -114,7 +114,7 @@ private static void setupChangedTask(
             check + "Changed",
             task -> {
               task.setGroup("verification");
-              task.setDescription("Runs the " + check + " task in all changed projects.");
+              task.setDescription("Runs the " + check + "Changed task in all changed projects.");
               task.setDependsOn(
                   affectedProjects.stream()
                       .map(p -> p.getPath() + ":" + check + "Dependents")

buildSrc/src/main/java/com/google/firebase/gradle/plugins/ci/device/FirebaseTestServer.java

@@ -46,7 +46,7 @@ public void uploadApks(String variantName, File testApk, File testedApk) {
     // test lab requires an "app" apk, so we give an empty apk to it.
     String testedApkPath =
         testedApk != null
-            ? testApk.toString()
+            ? testedApk.toString()
             : project.getRootDir() + "/buildSrc/resources/dummy.apk";
     project
         .getLogger()