Update dependencies and release 0.5.0-RC1 (#536)

* Update dependencies and release 0.5.0-RC1 * Ignore exceptions when execing if ignoring exit value. * Use RC2 * Catch workerExecutor exception * Format
curioswitch · Apr 10, 2020 · 9cde2ff · 9cde2ff
1 parent 435b9bd
commit 9cde2ff
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 28 deletions.
diff --git a/common/google-cloud/cloud-storage/gradle.properties b/common/google-cloud/cloud-storage/gradle.properties
@@ -21,4 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-version=0.0.43
+version=0.0.44
diff --git a/common/google-cloud/core/gradle.properties b/common/google-cloud/core/gradle.properties
@@ -21,4 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-version=0.0.43
+version=0.0.44
diff --git a/common/google-cloud/iam/gradle.properties b/common/google-cloud/iam/gradle.properties
@@ -21,4 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-version=0.0.43
+version=0.0.44
diff --git a/common/google-cloud/pubsub/gradle.properties b/common/google-cloud/pubsub/gradle.properties
@@ -21,4 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-version=0.0.43
+version=0.0.44
diff --git a/common/google-cloud/trace/gradle.properties b/common/google-cloud/trace/gradle.properties
@@ -21,4 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-version=0.0.43
+version=0.0.44
diff --git a/common/server/framework/gradle.properties b/common/server/framework/gradle.properties
@@ -21,4 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-version=0.2.1
+version=0.3.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -40,8 +40,8 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.enterprise").version("3.2")
-    id("org.curioswitch.gradle-curiostack-plugin").version("0.4.4")
+    id("com.gradle.enterprise").version("3.2.1")
+    id("org.curioswitch.gradle-curiostack-plugin").version("0.5.0-RC3")
 }
 
 configure<CuriostackExtension> {

diff --git a/tools/curiostack-bom/build.gradle.kts b/tools/curiostack-bom/build.gradle.kts
@@ -49,14 +49,14 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 
 val DEPENDENCY_BOMS = listOf(
         "com.fasterxml.jackson:jackson-bom:2.10.3",
-        "com.google.cloud:google-cloud-bom:0.123.0-alpha",
+        "com.google.cloud:google-cloud-bom:0.123.1-alpha",
         "com.google.api-client:google-api-client-bom:1.30.9",
         "com.google.http-client:google-http-client-bom:1.34.2",
-        "com.linecorp.armeria:armeria-bom:0.99.1",
+        "com.linecorp.armeria:armeria-bom:0.99.2",
         "io.dropwizard.metrics:metrics-bom:4.1.5",
-        "io.grpc:grpc-bom:1.28.0",
+        "io.grpc:grpc-bom:1.28.1",
         "io.micrometer:micrometer-bom:1.4.1",
-        "io.zipkin.brave:brave-bom:5.10.2",
+        "io.zipkin.brave:brave-bom:5.11.2",
         "io.netty:netty-bom:4.1.48.Final",
         "org.apache.beam:beam-sdks-java-bom:2.19.0",
         "org.apache.logging.log4j:log4j-bom:2.13.1",
@@ -76,7 +76,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "com.auth0",
-                "3.10.1",
+                "3.10.2",
                 listOf("java-jwt")
         ),
         DependencySet(
@@ -250,12 +250,12 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "org.bouncycastle",
-                "1.64",
+                "1.65",
                 listOf("bcpkix-jdk15on", "bcprov-jdk15on")
         ),
         DependencySet(
                 "org.checkerframework",
-                "3.2.0",
+                "3.3.0",
                 listOf("checker-qual")
         ),
         DependencySet(
@@ -318,12 +318,12 @@ val DEPENDENCY_SETS = listOf(
 
 val DEPENDENCIES = listOf(
         "com.bmuschko:gradle-docker-plugin:6.4.0",
-        "com.diffplug.spotless:spotless-plugin-gradle:3.28.0",
+        "com.diffplug.spotless:spotless-plugin-gradle:3.28.1",
         "com.github.ben-manes:gradle-versions-plugin:0.28.0",
         "com.google.code.gson:gson:2.8.6",
         "com.google.gradle:osdetector-gradle-plugin:1.6.2",
         "com.google.maps:google-maps-services:0.11.0",
-        "com.gradle:gradle-enterprise-gradle-plugin:3.2",
+        "com.gradle:gradle-enterprise-gradle-plugin:3.2.1",
         "com.hubspot.jinjava:jinjava:2.5.3",
         "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4",
         "de.undercouch:gradle-download-task:4.0.4",

diff --git a/tools/curiostack-bom/gradle.properties b/tools/curiostack-bom/gradle.properties
@@ -21,4 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-version=0.4.4
+version=0.5.0
diff --git a/tools/gradle-plugins/gradle-curiostack-plugin/build.gradle.kts b/tools/gradle-plugins/gradle-curiostack-plugin/build.gradle.kts
@@ -28,7 +28,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 plugins {
     `java-gradle-plugin`
     `maven-publish`
-    id("com.gradle.plugin-publish").version("0.10.1")
+    id("com.gradle.plugin-publish").version("0.11.0")
 }
 
 dependencies {

diff --git a/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties b/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties
@@ -21,4 +21,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-version=0.4.4
+version=0.5.0-RC3
diff --git a/...tack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/ToolDependencies.java b/...tack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/ToolDependencies.java
@@ -32,7 +32,7 @@ public class ToolDependencies {
 
   private static Map<String, String> DEFAULT_VERSIONS =
       ImmutableMap.<String, String>builder()
-          .put("bom", "0.4.3")
+          .put("bom", "0.5.0")
           .put("claat", "2.2.0")
           .put("gcloud", "286.0.0")
           .put("golang", "1.14.1")

diff --git a/...-plugin/src/main/java/org/curioswitch/gradle/plugins/gcloud/tasks/FetchToolCacheTask.java b/...-plugin/src/main/java/org/curioswitch/gradle/plugins/gcloud/tasks/FetchToolCacheTask.java
@@ -77,23 +77,28 @@ public void exec() throws Exception {
         exec -> {
           String gsutil = Os.isFamily(Os.FAMILY_WINDOWS) ? "gsutil" + ".cmd" : "gsutil";
 
-          exec.executable(toolManager.getBinDir("gcloud").resolve(gsutil));
+          exec.executable(gsutil);
 
           exec.args("cp", src.get(), archive);
 
           exec.setIgnoreExitValue(true);
         });
 
+    try {
+      workerExecutor.await();
+    } catch (Exception e) {
+      getLogger().warn("Cache failed to download, skipping.", e);
+    }
+
+    if (!Files.exists(archive)) {
+      getLogger().quiet("Cache failed to download, skipping.");
+      return;
+    }
+
     ExternalExecUtil.exec(
         getProject(),
         workerExecutor,
         exec -> {
-          if (!Files.exists(archive)) {
-            exec.executable("bash");
-            exec.args("-c", "echo Cache failed to download, skipping...");
-            return;
-          }
-
           exec.executable("bash");
           exec.workingDir(toolManager.getCuriostackDir());