Publish Curiostack 0.1.0 (#478)

curioswitch · Nov 14, 2019 · 6a463f4 · 6a463f4
1 parent 8603799
commit 6a463f4
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 26 deletions.
diff --git a/developer-portal/build.gradle.kts b/developer-portal/build.gradle.kts
@@ -23,7 +23,7 @@
  */
 
 plugins {
-    id("org.curioswitch.gradle-curio-static-site-plugin")
+    id("org.curioswitch.gradle-static-site-plugin")
 }
 
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -44,7 +44,7 @@ pluginManagement {
 
 plugins {
     id("com.gradle.enterprise").version("3.0")
-    id("org.curioswitch.gradle-curiostack-plugin").version("0.0.188-RC13")
+    id("org.curioswitch.gradle-curiostack-plugin").version("0.1.0")
 }
 
 configure<CuriostackExtension> {

diff --git a/tools/curiostack-bom/build.gradle.kts b/tools/curiostack-bom/build.gradle.kts
@@ -48,10 +48,10 @@ repositories {
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
 val DEPENDENCY_BOMS = listOf(
-        "com.fasterxml.jackson:jackson-bom:2.10.0",
+        "com.fasterxml.jackson:jackson-bom:2.10.1",
         "com.google.cloud:google-cloud-bom:0.116.0-alpha",
         "com.google.api-client:google-api-client-bom:1.30.5",
-        "com.google.http-client:google-http-client-bom:1.32.1",
+        "com.google.http-client:google-http-client-bom:1.33.0",
         "com.linecorp.armeria:armeria-bom:0.95.0",
         "io.dropwizard.metrics:metrics-bom:4.1.1",
         "io.grpc:grpc-bom:1.25.0",
@@ -113,11 +113,6 @@ val DEPENDENCY_SETS = listOf(
                 "3.0.2",
                 listOf("jsr305")
         ),
-        DependencySet(
-                "com.google.cloud",
-                "0.115.0-beta",
-                listOf("google-cloud-iot")
-        ),
         DependencySet(
                 "com.google.cloud.sql",
                 "1.0.15",
@@ -158,7 +153,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "com.spotify",
-                "4.2.1",
+                "4.2.2",
                 listOf("futures-extra")
         ),
         DependencySet(
@@ -189,7 +184,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "io.fabric8",
-                "4.6.2",
+                "4.6.3",
                 listOf("kubernetes-client")
         ),
         DependencySet(
@@ -234,7 +229,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "net.bytebuddy",
-                "1.10.2",
+                "1.10.3",
                 listOf("byte-buddy", "byte-buddy-agent")
         ),
         DependencySet(
@@ -254,7 +249,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "org.assertj",
-                "3.2.1",
+                "3.3.0",
                 listOf("assertj-guava")
         ),
         DependencySet(
@@ -309,7 +304,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "org.mockito",
-                "3.1.8",
+                "3.1.10",
                 listOf("mockito-core", "mockito-junit-jupiter")
         ),
         DependencySet(
@@ -319,7 +314,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "org.simpleflatmapper",
-                "8.1.1",
+                "8.2.0",
                 listOf(
                         "sfm-converter", "sfm-jdbc", "sfm-jooq", "sfm-map", "sfm-reflect", "sfm-util")
         ),
@@ -332,7 +327,7 @@ val DEPENDENCY_SETS = listOf(
 
 val DEPENDENCIES = listOf(
         "com.bmuschko:gradle-docker-plugin:5.3.0",
-        "com.diffplug.spotless:spotless-plugin-gradle:3.25.0",
+        "com.diffplug.spotless:spotless-plugin-gradle:3.26.0",
         "com.github.ben-manes:gradle-versions-plugin:0.27.0",
         "com.google.code.gson:gson:2.8.6",
         "com.google.gradle:osdetector-gradle-plugin:1.6.2",
@@ -344,7 +339,6 @@ val DEPENDENCIES = listOf(
         "gradle.plugin.com.boxfuse.client:gradle-plugin-publishing:6.0.6",
         "gradle.plugin.com.google.cloud.tools:jib-gradle-plugin:1.7.0",
         "gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:2.2.0",
-        "gradle.plugin.com.palantir.graal:gradle-graal:0.6.0-32-g68fa986",
         "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0",
         "io.sgr:s2-geometry-library-java:1.0.1",
         "it.unimi.dsi:fastutil:8.3.0",

diff --git a/tools/curiostack-bom/gradle.properties b/tools/curiostack-bom/gradle.properties
@@ -22,4 +22,4 @@
 # SOFTWARE.
 #
 
-version = 0.0.16
+version = 0.1.0
diff --git a/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties b/tools/gradle-plugins/gradle-curiostack-plugin/gradle.properties
@@ -22,4 +22,4 @@
 # SOFTWARE.
 #
 
-version = 0.0.188-RC13
+version = 0.1.0
diff --git a/...tack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/CuriostackPlugin.java b/...tack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/CuriostackPlugin.java
@@ -27,6 +27,7 @@
 import org.curioswitch.gradle.plugins.gcloud.GcloudBuildCachePlugin;
 import org.curioswitch.gradle.plugins.gcloud.buildcache.CloudStorageBuildCache;
 import org.gradle.api.Plugin;
+import org.gradle.api.artifacts.dsl.RepositoryHandler;
 import org.gradle.api.initialization.Settings;
 
 public class CuriostackPlugin implements Plugin<Settings> {
@@ -35,6 +36,8 @@ public class CuriostackPlugin implements Plugin<Settings> {
   public void apply(Settings settings) {
     var config = CuriostackExtension.createAndAdd(settings);
 
+    configureRepositories(settings.getBuildscript().getRepositories());
+
     settings.getPlugins().apply(GcloudBuildCachePlugin.class);
 
     var buildCache = settings.getBuildCache();
@@ -57,7 +60,14 @@ public void apply(Settings settings) {
         .getGradle()
         .rootProject(
             project -> {
+              configureRepositories(project.getBuildscript().getRepositories());
               project.getPlugins().apply(CuriostackRootPlugin.class);
             });
   }
+
+  private static void configureRepositories(RepositoryHandler repositories) {
+    repositories.jcenter();
+    repositories.gradlePluginPortal();
+    repositories.mavenLocal();
+  }
 }
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,18 +32,18 @@ public class ToolDependencies {
 
   private static Map<String, String> DEFAULT_VERSIONS =
       ImmutableMap.<String, String>builder()
-          .put("bom", "0.0.16")
+          .put("bom", "0.1.0")
           .put("claat", "2.2.0")
-          .put("gcloud", "269.0.0")
+          .put("gcloud", "271.0.0")
           .put("golang", "1.13.4")
           .put("google-java-format", "1.7")
-          .put("gradle", "6.0-rc-3")
+          .put("gradle", "6.0")
           .put("helm", "2.10.0")
           .put("miniconda", "Miniconda3-4.7.12.1")
           .put("node", "12.13.0")
           .put("openjdk", "zulu13.28.11-ca-jdk13.0.1")
           .put("openjdk8", "zulu8.42.0.21-ca-jdk8.0.232")
-          .put("terraform", "0.12.13")
+          .put("terraform", "0.12.14")
           .put("terraform-gsuite-provider", "0.1.35")
           .put("yarn", "1.19.1")
           .build();

diff --git a/tools/gradle-plugins/gradle-golang-plugin/build.gradle.kts b/tools/gradle-plugins/gradle-golang-plugin/build.gradle.kts
@@ -56,7 +56,7 @@ gradlePlugin {
 pluginBundle {
     website = "https://github.com/curioswitch/curiostack/"
     vcsUrl = "https://github.com/curioswitch/curiostack.git"
-    tags = listOf("curiostack", "gcp", "grpc", "terraform", "miniconda", "nodejs")
+    tags = listOf("curiostack", "go", "golang")
 }
 
 publishing {

diff --git a/tools/gradle-plugins/gradle-golang-plugin/gradle.properties b/tools/gradle-plugins/gradle-golang-plugin/gradle.properties
@@ -22,4 +22,4 @@
 # SOFTWARE.
 #
 
-version = 0.0.25
+version = 0.1.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ @@
      */
     plugins {
-        id("org.curioswitch.gradle-curio-static-site-plugin")
+        id("org.curioswitch.gradle-static-site-plugin")
     }
@@ Expand Down @@