Fixed download_artifacts.gradle reporting an error with existing artifacts.

If download_artifacts.gradle was executed and all required artifacts already
exist in the target directory it would report all artifacts missing.
This changes the script to always report all existing artifacts as copied
(i.e not missing).

Bug: 75298968
Change-Id: Iad793e66e71496366141b07e03dd0b9a07d32570

Author: Stewart Miles

CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 1.2.64 - Mar 16, 2017
+## Bug Fixes
+* Fixed bug in download_artifacts.gradle (used by Android Resolver) which
+  reported a failure if required artifacts already exist.
+
 # Version 1.2.63 - Feb 15, 2018
 ## Bug Fixes
 * Fixed iOS Resolver include search paths taking precedence over system headers

build.gradle

@@ -132,7 +132,7 @@ project.ext {
     buildPath = file('build').absolutePath
     exportPath = file('build/plugin.unitypackage').absolutePath
     dllDir = 'Assets/PlayServicesResolver/Editor'
-    pluginVersion = '1.2.63.0'
+    pluginVersion = '1.2.64.0'
     currentPluginPath = file('.').absolutePath
     currentPluginBasename = 'play-services-resolver'
     currentPluginName = (currentPluginBasename + '-' + pluginVersion +

exploded/Assets/PlayServicesResolver/Editor.meta

@@ -0,0 +1,4 @@
+Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.64.0.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
+Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.64.0.dll
+Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.64.0.dll

exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.63.0.dll renamed to exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.64.0.dll

@@ -387,28 +387,36 @@ project.ext {
               getVersionlessArtifactByPackage(packageSpecifier),
               artifact.moduleVersion.id.version,
               packageType == "srcaar" ? "aar" : packageType)
-    def copyTask = tasks.create(
-      name: "copy_" + artifactTargetFilename,
-      type: Copy,
-      description: sprintf("Copy %s (%s) to %s", packageSpecifier,
-                           artifact.file, artifactTargetFilename))
-    copyTask.with {
-      from artifact.file
-      into targetDir
-      rename(
-        // Rename the file to the target filename and log the copied file &
-        // artifact so that they can be summarized when all copy artifact tasks
-        // are complete.
-        {
-          String filename ->
-            copiedFileArtifacts.add([new File(artifactTargetFilename),
-                                     artifact])
-            return artifactTargetFilename
-        }
-      )
-      doFirst { logger.info(description) }
+    artifactTargetFile = new File(targetDir,
+                                  artifactTargetFilename)
+    if (artifactTargetFile.exists()) {
+      // If the target file already exists simply report it as copied.
+      copiedFileArtifacts.add([artifactTargetFile, artifact])
+    } else {
+      // If the target file does not exist generate a task to copy it.
+      def copyTask = tasks.create(
+        name: "copy_" + artifactTargetFilename,
+          type: Copy,
+          description: sprintf("Copy %s (%s) to %s", packageSpecifier,
+                               artifact.file, artifactTargetFilename))
+      copyTask.with {
+        from artifact.file
+        into targetDir
+        rename(
+          // Rename the file to the target filename and log the copied file &
+          // artifact so that they can be summarized when all copy artifact
+          // tasks are complete.
+          {
+            String filename ->
+              copiedFileArtifacts.add([new File(artifactTargetFilename),
+                                       artifact])
+              return artifactTargetFilename
+          }
+        )
+        doFirst { logger.info(description) }
+      }
+      copyTasks.add(copyTask)
     }
-    copyTasks.add(copyTask)
   }
 }
 

exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.63.0.dll.meta renamed to exploded/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.64.0.dll.meta

@@ -117,7 +117,7 @@ def createStartParameters(packagesToCopy, targetDir) {
   startParameters.projectProperties = [
     "ANDROID_HOME": project.ext.androidHome,
     "PACKAGES_TO_COPY": packagesToCopy,
-    "TARGET_DIR": targetDir.name,
+    "TARGET_DIR": targetDir.absolutePath,
     "MAVEN_REPOS": mavenRepo.toURI().toString()
   ]
   startParameters.logLevel = logging.level
@@ -215,7 +215,7 @@ def downloadScriptOutputToSectionsList(output) {
 // * Validates the script output matches scriptOutput (list of strings where
 //   each element is a section of the script's parsed output).
 def createTestTask(taskName, taskDescription, packageSpecification,
-                   outputInputFileMap, scriptOutput) {
+                   outputInputFileMap, scriptOutput, iterations=1) {
   // Create a target directory relative to the output directory.
   def targetDirFile = new File(project.ext.outputDir, taskName)
   // Move output file paths relative to the target directory and input paths
@@ -226,30 +226,34 @@ def createTestTask(taskName, taskDescription, packageSpecification,
       movedOutputInputFileMap[new File(targetDirFile, outputFile)] =
         inputFile != null ? new File(project.ext.mavenRepo, inputFile) : null
   }
-
-  def testTask = tasks.create(name: taskName,
-                              description: taskDescription,
-                              type: GradleBuild,
-                              dependsOn: createTestDirectoryTask(targetDirFile))
-  testTask.with {
-    outputs.files movedOutputInputFileMap.keySet()
-    startParameter createStartParameters(packageSpecification,
-                                         targetDirFile)
-    buildFile project.ext.buildFile
-    dir project.ext.outputDir
-    doFirst { project.ext.standardOutputErrorLogger.install(it) }
-    doLast {
-      project.ext.standardOutputErrorLogger.uninstall(it)
-      validateOutputFilesExist(it)
-      validateFilesMatch(it, movedOutputInputFileMap)
-      if (scriptOutput != null) {
-        assert downloadScriptOutputToSectionsList(
-          project.ext.standardOutputErrorLogger.output) == scriptOutput
+  def createDirectoryTask = createTestDirectoryTask(targetDirFile)
+  iterations.times {
+    def currentIteration = it + 1
+    def currentTaskName = taskName + (iterations > 1 ? "$currentIteration" : "")
+    println currentTaskName
+    def testTask = tasks.create(name: currentTaskName,
+                                description: taskDescription,
+                                type: GradleBuild,
+                                dependsOn: createDirectoryTask)
+    testTask.with {
+      outputs.files movedOutputInputFileMap.keySet()
+      startParameter createStartParameters(packageSpecification,
+                                           targetDirFile)
+      buildFile project.ext.buildFile
+      dir project.ext.outputDir
+      doFirst { project.ext.standardOutputErrorLogger.install(it) }
+      doLast {
+        project.ext.standardOutputErrorLogger.uninstall(it)
+        validateOutputFilesExist(it)
+        validateFilesMatch(it, movedOutputInputFileMap)
+        if (scriptOutput != null) {
+          assert downloadScriptOutputToSectionsList(
+            project.ext.standardOutputErrorLogger.output) == scriptOutput
+        }
       }
     }
+    project.ext.testTaskNames.add(currentTaskName)
   }
-  project.ext.testTaskNames.add(taskName)
-  return testTask
 }
 
 createTestTask(
@@ -265,6 +269,21 @@ createTestTask(
    "android.arch.core.common-1.0.0.jar\n" +
    "com.android.support.support-annotations-26.1.0.jar"])
 
+createTestTask(
+  "testDownloadAvailableTwice",
+  "Downloads a single artifact and it's dependencies from maven.",
+  "android.arch.core:common:1.0.0",
+  ["android.arch.core.common-1.0.0.jar":
+   "android/arch/core/common/1.0.0/common-1.0.0.jar",
+   "com.android.support.support-annotations-26.1.0.jar":
+   "com/android/support/support-annotations/26.1.0/" +
+   "support-annotations-26.1.0.jar"],
+  ["Copied artifacts:\n" +
+   "android.arch.core.common-1.0.0.jar\n" +
+   "com.android.support.support-annotations-26.1.0.jar"],
+  2 /* iterations */)
+
+
 createTestTask(
   "testDownloadAvailableWithSameName",
   "Downloads artifacts with the same artifact name and their dependencies " +