Skip to content
This repository was archived by the owner on Jul 11, 2024. It is now read-only.

Commit 251c7aa

Browse files
chokoswitchchokoswitch
authored
Update dependencies (#503)
* Update dependencies * Timeout * Simplify ConvertConfigsToJson
1 parent df2a644 commit 251c7aa

File tree

7 files changed

+50
-57
lines changed

7 files changed

+50
-57
lines changed

‎cloudbuild-pr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ steps:
8181
- GRADLE_USER_HOME=/root/.gradle
8282
secretEnv:
8383
- CODECOV_TOKEN
84+
timeout: 60m
8485
secrets:
8586
- kmsKeyName: projects/curioswitch-cluster/locations/us-central1/keyRings/cloudbuild/cryptoKeys/github
8687
secretEnv:

‎gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
version = 0.0.0
2626

2727
org.curioswitch.curiostack.is_curiostack = true
28+
org.curioswitch.curiostack.tools.gradle = 6.1
2829

2930
org.gradle.caching = true
3031
org.gradle.parallel = true

‎gradle/wrapper/gradle-wrapper.jar

-7 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎tools/curiostack-bom/build.gradle.kts

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -48,26 +48,24 @@ repositories {
4848
data class DependencySet(val group: String, val version: String, val modules: List<String>)
4949

5050
val DEPENDENCY_BOMS = listOf(
51-
"com.fasterxml.jackson:jackson-bom:2.10.1",
52-
"com.google.cloud:google-cloud-bom:0.120.2-alpha",
53-
// TODO(choko): Remove after https://github.com/googleapis/java-cloud-bom/pull/142
54-
"com.google.cloud:google-cloud-trace-bom:0.109.3-beta",
55-
"com.google.api-client:google-api-client-bom:1.30.5",
56-
"com.google.http-client:google-http-client-bom:1.33.0",
51+
"com.fasterxml.jackson:jackson-bom:2.10.2",
52+
"com.google.cloud:google-cloud-bom:0.121.0-alpha",
53+
"com.google.api-client:google-api-client-bom:1.30.7",
54+
"com.google.http-client:google-http-client-bom:1.34.0",
5755
"com.linecorp.armeria:armeria-bom:0.97.0",
58-
"io.dropwizard.metrics:metrics-bom:4.1.1",
59-
"io.grpc:grpc-bom:1.25.0",
56+
"io.dropwizard.metrics:metrics-bom:4.1.2",
57+
"io.grpc:grpc-bom:1.26.0",
6058
"io.zipkin.brave:brave-bom:5.9.1",
6159
"io.netty:netty-bom:4.1.43.Final",
6260
"org.apache.beam:beam-sdks-java-bom:2.16.0",
63-
"org.apache.logging.log4j:log4j-bom:2.12.1",
64-
"org.junit:junit-bom:5.5.2"
61+
"org.apache.logging.log4j:log4j-bom:2.13.0",
62+
"org.junit:junit-bom:5.6.0"
6563
)
6664

6765
val DEPENDENCY_SETS = listOf(
6866
DependencySet(
6967
"commons-codec",
70-
"1.13",
68+
"1.14",
7169
listOf("commons-codec")
7270
),
7371
DependencySet(
@@ -77,12 +75,12 @@ val DEPENDENCY_SETS = listOf(
7775
),
7876
DependencySet(
7977
"com.auth0",
80-
"3.8.3",
78+
"3.9.0",
8179
listOf("java-jwt")
8280
),
8381
DependencySet(
8482
"com.google.auth",
85-
"0.18.0",
83+
"0.19.0",
8684
listOf("google-auth-library-oauth2-http")
8785
),
8886
DependencySet(
@@ -102,7 +100,7 @@ val DEPENDENCY_SETS = listOf(
102100
),
103101
DependencySet(
104102
"com.github.ben-manes.caffeine",
105-
"2.8.0",
103+
"2.8.1",
106104
listOf("caffeine")
107105
),
108106
DependencySet(
@@ -125,7 +123,7 @@ val DEPENDENCY_SETS = listOf(
125123
),
126124
DependencySet(
127125
"com.google.dagger",
128-
"2.25.2",
126+
"2.25.4",
129127
listOf("dagger", "dagger-compiler", "dagger-producers")
130128
),
131129
DependencySet(
@@ -135,12 +133,12 @@ val DEPENDENCY_SETS = listOf(
135133
),
136134
DependencySet(
137135
"com.google.firebase",
138-
"6.11.0",
136+
"6.12.0",
139137
listOf("firebase-admin")
140138
),
141139
DependencySet(
142140
"com.google.guava",
143-
"28.1-jre",
141+
"28.2-jre",
144142
listOf("guava", "guava-testlib")
145143
),
146144
DependencySet(
@@ -150,7 +148,7 @@ val DEPENDENCY_SETS = listOf(
150148
),
151149
DependencySet(
152150
"com.google.protobuf",
153-
"3.11.1",
151+
"3.11.2",
154152
listOf("protoc")
155153
),
156154
DependencySet(
@@ -160,7 +158,7 @@ val DEPENDENCY_SETS = listOf(
160158
),
161159
DependencySet(
162160
"com.squareup.retrofit2",
163-
"2.6.2",
161+
"2.7.0",
164162
listOf(
165163
"adapter-guava",
166164
"adapter-java8",
@@ -176,7 +174,7 @@ val DEPENDENCY_SETS = listOf(
176174
),
177175
DependencySet(
178176
"com.zaxxer",
179-
"3.4.1",
177+
"3.4.2",
180178
listOf("HikariCP")
181179
),
182180
DependencySet(
@@ -186,7 +184,7 @@ val DEPENDENCY_SETS = listOf(
186184
),
187185
DependencySet(
188186
"io.fabric8",
189-
"4.6.4",
187+
"4.7.0",
190188
listOf("kubernetes-client")
191189
),
192190
DependencySet(
@@ -196,7 +194,7 @@ val DEPENDENCY_SETS = listOf(
196194
),
197195
DependencySet(
198196
"io.micrometer",
199-
"1.3.2",
197+
"1.3.3",
200198
listOf("micrometer-core", "micrometer-registry-prometheus")
201199
),
202200
DependencySet(
@@ -226,22 +224,22 @@ val DEPENDENCY_SETS = listOf(
226224
),
227225
DependencySet(
228226
"junit",
229-
"4.12",
227+
"4.13",
230228
listOf("junit")
231229
),
232230
DependencySet(
233231
"net.bytebuddy",
234-
"1.10.4",
232+
"1.10.7",
235233
listOf("byte-buddy", "byte-buddy-agent")
236234
),
237235
DependencySet(
238236
"org.apache.httpcomponents",
239-
"4.5.10",
237+
"4.5.11",
240238
listOf("httpclient")
241239
),
242240
DependencySet(
243241
"org.apache.httpcomponents",
244-
"4.4.12",
242+
"4.4.13",
245243
listOf("httpcore")
246244
),
247245
DependencySet(
@@ -256,7 +254,7 @@ val DEPENDENCY_SETS = listOf(
256254
),
257255
DependencySet(
258256
"org.awaitility",
259-
"4.0.1",
257+
"4.0.2",
260258
listOf("awaitility")
261259
),
262260
DependencySet(
@@ -266,7 +264,7 @@ val DEPENDENCY_SETS = listOf(
266264
),
267265
DependencySet(
268266
"org.checkerframework",
269-
"3.0.1",
267+
"3.1.0",
270268
listOf("checker-qual")
271269
),
272270
DependencySet(
@@ -281,12 +279,12 @@ val DEPENDENCY_SETS = listOf(
281279
),
282280
DependencySet(
283281
"org.eclipse.jgit",
284-
"5.5.1.201910021850-r",
282+
"5.6.0.201912101111-r",
285283
listOf("org.eclipse.jgit")
286284
),
287285
DependencySet(
288286
"org.immutables",
289-
"2.8.2",
287+
"2.8.3",
290288
listOf("builder", "value", "value-annotations")
291289
),
292290
DependencySet(
@@ -296,7 +294,7 @@ val DEPENDENCY_SETS = listOf(
296294
),
297295
DependencySet(
298296
"org.jctools",
299-
"2.1.2",
297+
"3.0.0",
300298
listOf("jctools-core")
301299
),
302300
DependencySet(
@@ -306,7 +304,7 @@ val DEPENDENCY_SETS = listOf(
306304
),
307305
DependencySet(
308306
"org.mockito",
309-
"3.2.0",
307+
"3.2.8",
310308
listOf("mockito-core", "mockito-junit-jupiter")
311309
),
312310
DependencySet(
@@ -328,13 +326,13 @@ val DEPENDENCY_SETS = listOf(
328326
)
329327

330328
val DEPENDENCIES = listOf(
331-
"com.bmuschko:gradle-docker-plugin:6.0.0",
332-
"com.diffplug.spotless:spotless-plugin-gradle:3.26.1",
329+
"com.bmuschko:gradle-docker-plugin:6.1.2",
330+
"com.diffplug.spotless:spotless-plugin-gradle:3.27.1",
333331
"com.github.ben-manes:gradle-versions-plugin:0.27.0",
334332
"com.google.code.gson:gson:2.8.6",
335333
"com.google.gradle:osdetector-gradle-plugin:1.6.2",
336-
"com.google.maps:google-maps-services:0.10.1",
337-
"com.gradle:gradle-enterprise-gradle-plugin:3.1",
334+
"com.google.maps:google-maps-services:0.10.2",
335+
"com.gradle:gradle-enterprise-gradle-plugin:3.1.1",
338336
"com.hubspot.jinjava:jinjava:2.5.2",
339337
"com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4",
340338
"de.undercouch:gradle-download-task:4.0.2",
@@ -347,10 +345,10 @@ val DEPENDENCIES = listOf(
347345
"javax.activation:activation:1.1.1",
348346
"javax.annotation:javax.annotation-api:1.3.2",
349347
"me.champeau.gradle:jmh-gradle-plugin:0.5.0",
350-
"mysql:mysql-connector-java:8.0.18",
348+
"mysql:mysql-connector-java:8.0.19",
351349
"net.ltgt.gradle:gradle-apt-plugin:0.21",
352350
"net.ltgt.gradle:gradle-errorprone-plugin:1.1.1",
353-
"nu.studer:gradle-jooq-plugin:3.0.3",
351+
"nu.studer:gradle-jooq-plugin:4.1",
354352
"org.jsoup:jsoup:1.12.1"
355353
)
356354

‎tools/gradle-plugins/gradle-curiostack-plugin/src/main/java/org/curioswitch/gradle/plugins/curiostack/ToolDependencies.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ public class ToolDependencies {
3434
ImmutableMap.<String, String>builder()
3535
.put("bom", "0.3.0")
3636
.put("claat", "2.2.0")
37-
.put("gcloud", "272.0.0")
38-
.put("golang", "1.13.5")
37+
.put("gcloud", "276.0.0")
38+
.put("golang", "1.13.6")
3939
.put("google-java-format", "1.7")
40-
.put("gradle", "6.0.1")
40+
.put("gradle", "6.1")
4141
.put("helm", "2.10.0")
4242
.put("miniconda", "Miniconda3-4.7.12.1")
43-
.put("node", "13.3.0")
43+
.put("node", "13.6.0")
4444
.put("openjdk", "zulu13.28.11-ca-jdk13.0.1")
4545
.put("openjdk8", "zulu8.42.0.21-ca-jdk8.0.232")
46-
.put("terraform", "0.12.17")
47-
.put("terraform-gsuite-provider", "0.1.35")
48-
.put("yarn", "1.19.2")
46+
.put("terraform", "0.12.19")
47+
.put("terraform-gsuite-provider", "0.1.36")
48+
.put("yarn", "1.21.1")
4949
.build();
5050

5151
public static String getBomVersion(Project project) {

‎tools/gradle-plugins/gradle-curiostack-plugin/src/main/java/org/curioswitch/gradle/plugins/terraform/tasks/ConvertConfigsToJsonTask.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424
package org.curioswitch.gradle.plugins.terraform.tasks;
2525

26-
import static com.google.common.base.Preconditions.checkNotNull;
2726
import static com.google.common.io.Files.getNameWithoutExtension;
2827
import static java.nio.file.Files.createDirectories;
2928

@@ -43,7 +42,6 @@
4342
import java.nio.file.Path;
4443
import javax.inject.Inject;
4544
import org.gradle.api.DefaultTask;
46-
import org.gradle.api.file.ProjectLayout;
4745
import org.gradle.api.provider.Property;
4846
import org.gradle.api.tasks.InputFiles;
4947
import org.gradle.api.tasks.OutputDirectory;
@@ -151,6 +149,7 @@ void exec() {
151149
.submit(
152150
ConvertToJson.class,
153151
parameters -> {
152+
parameters.getProjectDirectory().set(project.getProjectDir());
154153
parameters.getSourceFile().set(file);
155154
parameters.getOutFile().set(outPath.toFile());
156155
});
@@ -167,14 +166,6 @@ private static String flattenFilename(Path relativePath, String filename) {
167166

168167
public abstract static class ConvertToJson implements WorkAction<ActionParameters> {
169168

170-
private final ProjectLayout layout;
171-
172-
@SuppressWarnings("InjectOnConstructorOfAbstractClass")
173-
@Inject
174-
public ConvertToJson(ProjectLayout layout) {
175-
this.layout = checkNotNull(layout, "layout");
176-
}
177-
178169
@Override
179170
public void execute() {
180171
File sourceFile = getParameters().getSourceFile().get();
@@ -184,7 +175,7 @@ public void execute() {
184175
if (sourceFile.getName().contains(".jinja.")) {
185176
var jinJava = new Jinjava();
186177
try {
187-
jinJava.setResourceLocator(new FileLocator(layout.getProjectDirectory().getAsFile()));
178+
jinJava.setResourceLocator(new FileLocator(getParameters().getProjectDirectory().get()));
188179
} catch (FileNotFoundException e) {
189180
throw new IllegalStateException("Could not initialize Jinjava");
190181
}
@@ -220,6 +211,8 @@ public void execute() {
220211
}
221212

222213
public interface ActionParameters extends WorkParameters {
214+
Property<File> getProjectDirectory();
215+
223216
Property<File> getSourceFile();
224217

225218
Property<File> getOutFile();

0 commit comments

Comments
 (0)