Add task to bump versions in gradle (#497)

Author: nwbirnie

build.gradle

@@ -0,0 +1,47 @@
+import java.util.regex.Pattern
+
+/** Defines a custom task for updating version numbers. */
+abstract class UpdateVersionTask extends DefaultTask {
+
+    static final def VERSION_REGEX = "([0-9]+)\\.([0-9]+)\\.([0-9]+)(-SNAPSHOT)?"
+
+    @Input
+    String newVersion
+
+    @InputFile
+    File propertiesFile = project.file("${project.projectDir}/gradle.properties")
+
+    @TaskAction
+    def update() {
+        if (newVersion == null) {
+            throw new GradleException("Need to specify newVersion")
+        }
+        if (propertiesFile == null) {
+            throw new GradleException("Need to specify gradlePropertiesFile")
+        }
+        if (!newVersion.matches(VERSION_REGEX)) {
+            throw new GradleException("Invalid format for -PnewVersion. Expecting: ${VERSION_REGEX}")
+        }
+        def toSet = new Properties()
+        propertiesFile.withInputStream { toSet.load(it) }
+        toSet.version = newVersion
+        propertiesFile.withOutputStream { toSet.store(it, "See LICENSE for license terms") }
+    }
+}
+
+/** Updates the version to version specified with -PnewVersion=foo. */
+task updateVersion(type: UpdateVersionTask) {
+    newVersion = project.properties.newVersion
+}
+
+/** Updates the version to the next snapshot. */
+task updateVersionToNextSnapshot(type: UpdateVersionTask) {
+    def current = new Properties()
+    propertiesFile.withInputStream { current.load(it) }
+    def matcher = Pattern.compile(VERSION_REGEX).matcher(current.version)
+    if (!matcher.find()) {
+        throw new GradleException("Current version cannot be parsed: ${current.version} expected match of: ${VERSION_REGEX}")
+    }
+    def toSet = "${matcher.group(1)}.${matcher.group(2)}.${Integer.parseInt(matcher.group(3)) + 1}-SNAPSHOT"
+    newVersion = toSet
+}

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

@@ -35,8 +35,6 @@ repositories {
     mavenLocal()
 }
 
-group = 'com.google.api-ads'
-version = '15.0.0'
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 java.targetCompatibility = JavaVersion.VERSION_1_8
 

google-ads/build.gradle

@@ -174,12 +174,10 @@ task copyLicenses(type: Copy) {
   dependsOn 'generateLicenses'
   mustRunAfter 'createThirdPartyDirectory'
 
-  def inputFiles = tasks.generateLicenses.outputs.files.asFileTree.files
-      .findAll { it.path.contains "dependency-license"}
-
-  from inputFiles
+  from new File(tasks.generateLicenses.xmlDestination.getAbsolutePath(), "dependency-license.json"),
+          new File(tasks.generateLicenses.xmlDestination.getAbsolutePath(), "dependency-license.html"),
+          new File(tasks.generateLicenses.xmlDestination.getAbsolutePath(), "dependency-license.xml")
   into tasks.generateThirdPartyDirectory.thirdPartyDir
-  // Rename files to LICENSES.*
   eachFile {
     if (!path.contains("dependency-license")) {
       throw new GradleException(
@@ -191,11 +189,13 @@ 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 (inputFiles.size() != inputs.sourceFiles.size()) {
+    //
+    // We're expecting exactly 3 input files, a JSON, XML and HTML version of
+    // the license report.
+    if (3 != inputs.sourceFiles.size()) {
       throw new GradleException(
-          "Failed to locate files to copy from. Expected: "
-              + inputFiles
-              + " but was: " + inputs.sourceFiles.toList())
+          "Failed to locate files to copy from. Expected: 3 but was: "
+                  + inputs.sourceFiles.toList())
     }
   }
 }

gradle.properties

@@ -1,22 +1,8 @@
-#
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# These are global settings for the gradle build process.
-
-org.gradle.jvmargs=-Xmx5g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#See LICENSE for license terms
+#Fri Nov 05 19:01:55 GMT 2021
 org.gradle.caching=true
-org.gradle.console=rich
 org.gradle.parallel=true
-
+org.gradle.jvmargs=-Xmx5g -XX\:MaxMetaspaceSize\=2048m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
+org.gradle.console=rich
+version=15.0.1-SNAPSHOT
+group=com.google.api-ads