Fixes to enable publishing the library with gradle (#496)

Author: nwbirnie

buildSrc/src/main/groovy/com.google.api-ads.java-conventions.gradle

@@ -24,6 +24,7 @@ import java.util.regex.Matcher
 plugins {
   id 'java-library'
   id 'maven-publish'
+  id 'signing'
 }
 
 // The order of the repositories here is important. If mavenLocal() is first,
@@ -48,12 +49,91 @@ javadoc {
   options.addStringOption('Xdoclint:none', '-quiet')
 }
 
+final def sonatypeCredentialsConfig = file(System.properties['user.home'] + '/.sonatype-creds')
+
 publishing {
   publications {
     maven(MavenPublication) {
       from(components.java)
     }
   }
+  repositories {
+    maven {
+      url 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
+      name = "sonatype"
+
+      if (sonatypeCredentialsConfig.exists()) {
+        def props = new Properties()
+        sonatypeCredentialsConfig.withInputStream { props.load(it) }
+        credentials {
+          username props['username']
+          password props['password']
+        }
+      }
+    }
+  }
+}
+
+// Provide a helpful error message for missing sonatype credentials.
+tasks.findAll {
+  if (it.name.matches("publish.+ToSonatypeRepository")) {
+    it.doFirst {
+      if (!sonatypeCredentialsConfig.exists()) {
+        throw new GradleException("Unable to load Sonatype credentials from ${sonatypeCredentialsConfig}.")
+      }
+    }
+  }
+}
+
+ext.configurePom = { publication, nameToSet, descriptionToSet ->
+  publication.pom {
+    name = nameToSet
+    description = descriptionToSet
+    packaging 'jar'
+    url = 'https://github.com/googleads/google-ads-java'
+    licenses {
+      license {
+        name = 'The Apache License, Version 2.0'
+        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+      }
+    }
+    scm {
+      connection = 'scm:git:https://github.com/googleads/google-ads-java'
+      developerConnection = 'scm:git:https://github.com/googleads/google-ads-java'
+      url = 'https://github.com/googleads/google-ads-java'
+    }
+    developers {
+      developer {
+        id = 'josh'
+        name = 'Josh Radcliff'
+        email = 'jradcliff@users.noreply.github.com'
+        organization = 'Google'
+        organizationUrl = 'https://www.google.com'
+      }
+      developer {
+        id = 'nick'
+        name = 'Nick Birnie'
+        email = 'nwbirnie@users.noreply.github.com'
+        organization = 'Google'
+        organizationUrl = 'https://www.google.com'
+      }
+      developer {
+        id = 'devin'
+        name = 'Devin Chasanoff'
+        email = 'devchas@users.noreply.github.com'
+        organization = 'Google'
+        organizationUrl = 'https://www.google.com'
+      }
+    }
+  }
+}
+
+// Disables signing tasks except on sonatype deploy. Avoids failing build for
+// users without GPG configured.
+if (project.properties.containsKey("release")) {
+  signing {
+    sign publishing.publications
+  }
 }
 
 tasks.withType(JavaCompile) {

google-ads-annotation-processing/build.gradle

@@ -29,3 +29,12 @@ dependencies {
 
 description = 'Google Ads API client library for Java annotation processor'
 
+publishing {
+    publications {
+        maven(MavenPublication) { publication ->
+            configurePom(publication,
+                    "Google Ads API client library for Java - main library",
+                    "Annotations + processor for code generation")
+        }
+    }
+}

google-ads/build.gradle

@@ -22,7 +22,6 @@ import com.google.common.collect.Sets
 
 plugins {
   id 'com.google.api-ads.java-conventions'
-  id 'signing'
   id 'com.google.protobuf' version '0.8.15'
   id "com.github.hierynomus.license-report" version "0.15.0"
   id 'com.github.johnrengelman.shadow' version '6.1.0'
@@ -311,52 +310,13 @@ task testShadowJar {
   }
 }
 
-def configurePom(publication, nameToSet, descriptionToSet) {
-  publication.pom {
-    name = nameToSet
-    description = descriptionToSet
-    url = 'https://github.com/googleads/google-ads-java'
-    licenses {
-      license {
-        name = 'The Apache License, Version 2.0'
-        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-      }
-    }
-    scm {
-      connection = 'scm:git:https://github.com/googleads/google-ads-java'
-      developerConnection = 'scm:git:https://github.com/googleads/google-ads-java'
-      url = 'https://github.com/googleads/google-ads-java'
-    }
-    developers {
-      developer {
-        id = 'josh'
-        name = 'Josh Radcliff'
-        email = 'jradcliff@users.noreply.github.com'
-        organization = 'Google'
-        organizationUrl = 'https://www.google.com'
-      }
-      developer {
-        id = 'nick'
-        name = 'Nick Birnie'
-        email = 'nwbirnie@users.noreply.github.com'
-        organization = 'Google'
-        organizationUrl = 'https://www.google.com'
-      }
-      developer {
-        id = 'devin'
-        name = 'Devin Chasanoff'
-        email = 'devchas@users.noreply.github.com'
-        organization = 'Google'
-        organizationUrl = 'https://www.google.com'
-      }
-    }
-  }
-}
-
-final def sonatypeCredentialsConfig = file(System.properties['user.home'] + '/.sonatype-creds')
-
 publishing {
   publications {
+    maven(MavenPublication) { publication ->
+      configurePom(publication,
+          "Google Ads API client library for Java - main library",
+          "Main library for the Google Ads API client library for Java")
+    }
     shadow(MavenPublication) { publication ->
       project.shadow.component(publication)
       // Publishes the javadoc + sources with the shadowjar.
@@ -375,46 +335,4 @@ publishing {
           "Provides a jar with all dependencies")
     }
   }
-
-  repositories {
-    maven {
-      url 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
-      name = "sonatype"
-
-      if (sonatypeCredentialsConfig.exists()) {
-        def props = new Properties()
-        sonatypeCredentialsConfig.withInputStream { props.load(it) }
-        credentials {
-          username props['username']
-          password props['password']
-        }
-      }
-    }
-  }
-}
-
-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")) {
-    it.doFirst {
-      if (!sonatypeCredentialsConfig.exists()) {
-        throw new GradleException("Unable to load Sonatype credentials from ${sonatypeCredentialsConfig}.")
-      }
-    }
-  }
 }
-

settings.gradle

@@ -21,6 +21,9 @@ rootProject.name = 'google-ads-parent'
 
 include ':google-ads-annotation-processing'
 include ':google-ads'
-include ':google-ads-examples'
-include ':google-ads-migration-examples'
 
+// Enables the examples project only if we're not deploying to Sonatype.
+if (!startParameter.projectProperties.containsKey("release")) {
+	include ':google-ads-examples'
+	include ':google-ads-migration-examples'
+}