Make shadowJar less onerous (#475)

* Make shadowJar less onerous

A couple of improvements to build velocity here:
- use the output files of the generate licenses task. This means that shadowJar can use the cache (can remove upToDateWhen=false).
- SmokeTest is only blocking on publish to sonatype.
- SmokeTest times out after 20 seconds (e.g. in case of bad OAuth credentials).
- Avoid failing the build if signing isn't configured
- check for errors in SmokeTest (this was a bug).

Author: nwbirnie

google-ads/build.gradle

@@ -114,19 +114,10 @@ task generateLicenses(type: nl.javadude.gradle.plugins.license.DownloadLicenses)
   description = "Copies the license report into the third_party directory"
 
   includeProjectDependencies = true
+
   // Works around issue where the plugin looks at the deprecated 'compile'
   // configuration by default.
   dependencyConfiguration = 'runtimeClasspath'
-
-  // Defines variables for the expected output files.
-  def outputDirectory = tasks.downloadLicenses.outputs.files.files.find()
-  def outputFilePattern = outputDirectory.absoluteFile.path + File.separator + "dependency-license."
-  def licenses = ["html", "json", "xml"].collect({ file(outputFilePattern + it) })
-
-  // Exports the output file names for use elsewhere.
-  ext {
-    licenseFiles = licenses
-  }
 }
 
 task verifyLicenses() {
@@ -135,7 +126,7 @@ task verifyLicenses() {
 
   doLast {
     // Reads the dependency-license.json file generated by generateLicenses.
-    def inputFile = tasks.generateLicenses.licenseFiles.find { it.path.endsWith(".json") }
+    def inputFile = tasks.generateLicenses.outputs.files.files.find { it.path.endsWith(".json") }
     def json = new JsonSlurper().parseText(inputFile.text)
     // Gets all the licenses except those for ourselves (which aren't set yet).
     def licenses = json
@@ -183,7 +174,10 @@ task copyLicenses(type: Copy) {
   dependsOn 'generateLicenses'
   mustRunAfter 'createThirdPartyDirectory'
 
-  from tasks.generateLicenses.licenseFiles
+  def inputFiles = tasks.generateLicenses.outputs.files.asFileTree.files
+      .findAll { it.path.contains "dependency-license"}
+
+  from inputFiles
   into tasks.generateThirdPartyDirectory.thirdPartyDir
   // Rename files to LICENSES.*
   eachFile {
@@ -197,10 +191,10 @@ task copyLicenses(type: Copy) {
     // Fails the build if we didn't copy everything. Gradle will fail silently if
     // it cannot copy one of the inputs which is dangerous when you're dealing
     // with legal obligations.
-    if (tasks.generateLicenses.licenseFiles.size() != inputs.sourceFiles.size()) {
+    if (inputFiles.size() != inputs.sourceFiles.size()) {
       throw new GradleException(
           "Failed to locate files to copy from. Expected: "
-              + tasks.generateLicenses.licenseFiles
+              + inputFiles
               + " but was: " + inputs.sourceFiles.toList())
     }
   }
@@ -275,15 +269,12 @@ shadowJar {
   // Removes the default -all classifier.
   archiveClassifier = ''
 
-  // Requires that this task is always run and does not build from the cache.
-  outputs.upToDateWhen { false }
-
   // Updates the META-INF/services directory with the services from dependencies
   mergeServiceFiles()
 
   // Includes the license report with the shadow jar.
   dependsOn 'generateLicenses'
-  from tasks.generateLicenses.licenseFiles
+  from tasks.generateLicenses.outputs
 
   finalizedBy 'testShadowJar'
 }
@@ -296,17 +287,25 @@ task testShadowJar {
 
   doLast {
     javaexec {
-      mainClass = "com.google.ads.googleads.lib.SmokeTest"
+      // Runs the JUnit main method.
+      mainClass = "org.junit.runner.JUnitCore"
+
+      // Passes the class name of the test to run.
+      args "com.google.ads.googleads.lib.SmokeTest"
+
       // Uses a special configuration to run the smoke tests. Allows us to
       // replace the google-ads dependency with the shaded artifact so we can
       // test it. Otherwise we'd just run end up running the smoke tests on
       // the normal jar twice.
       classpath = project.configurations.shadeTest +
-          // Uses the compiler output directly, rather than getting the
-          // dependencies from the configuration (since this would include
-          // the artifact we're trying to ignore).
-          files(sourceSets.functionalTest.output.classesDirs.files,
-              shadowJar.outputs.files)
+              // Uses the compiler output directly, rather than getting the
+              // dependencies from the configuration (since this would include
+              // the artifact we're trying to ignore).
+              files(sourceSets.functionalTest.output.classesDirs.files,
+                      shadowJar.outputs.files)
+
+      // Allows the smoke tests to pass unless we're publishing to sonatype.
+      ignoreExitValue = !gradle.taskGraph.hasTask("publishMavenPublicationToSonatypeRepository")
     }
   }
 }
@@ -397,6 +396,16 @@ signing {
   sign publishing.publications.shadow
 }
 
+// Disables signing tasks except on sonatype deploy. Avoids failing build for
+// users without GPG configured.
+gradle.taskGraph.whenReady {
+  if (gradle.taskGraph.allTasks
+      .findAll { it.name.matches("publish.+ToSonatypeRepository") }
+      .isEmpty()) {
+    tasks.findByName("signShadowPublication").enabled = false
+  }
+}
+
 // Provide a helpful error message for missing sonatype credentials.
 tasks.findAll {
   if (it.name.matches("publish.+ToSonatypeRepository")) {

google-ads/src/test/functional/java/com/google/ads/googleads/lib/SmokeTest.java

@@ -26,10 +26,12 @@
 import com.google.api.gax.grpc.GrpcCallContext;
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.JUnitCore;
+import org.junit.rules.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.threeten.bp.Duration;
@@ -44,15 +46,7 @@
 @RunWith(JUnit4.class)
 public class SmokeTest {
 
-  /**
-   * Provides a main method to run these tests. Useful for testing artifacts such as shadow jar
-   * which require modifying the runtime classpath.
-   */
-  public static void main(String[] args) {
-    System.out.println("Running SmokeTest");
-    JUnitCore.runClasses(SmokeTest.class);
-    System.out.println("Successfully completed SmokeTest");
-  }
+  @Rule public Timeout timeout = new Timeout(20_000, TimeUnit.MILLISECONDS);
 
   @Test
   public void ensureCanReadAllAvailableCustomersCampaigns() throws IOException {