Skip to content

Commit b34e0c9

Browse files
Migrate to version catalog, configure dependabot (#424)
* Migrate to version catalog * Add dependabot and dependency submission
1 parent 83ac866 commit b34e0c9

File tree

23 files changed

+305
-249
lines changed

23 files changed

+305
-249
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "gradle"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Dependency Submission
2+
3+
on:
4+
push:
5+
branches: [ 'main' ]
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
dependency-submission:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout sources
15+
uses: actions/checkout@v4
16+
- name: Setup Java
17+
uses: actions/setup-java@v4
18+
with:
19+
distribution: 'temurin'
20+
java-version: 17
21+
- name: Generate and submit dependency graph
22+
uses: gradle/actions/dependency-submission@v4

admin-client/build.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
33
plugins {
44
`java-library`
55
`java-conventions`
6-
id("org.openapi.generator") version "7.5.0"
6+
alias(libs.plugins.openapi.generator)
77
`library-publishing-conventions`
88
}
99

1010
description = "Code-generated Admin API client for Restate"
1111

1212
dependencies {
13-
implementation(platform(jacksonLibs.jackson.bom))
14-
implementation(jacksonLibs.jackson.core)
15-
implementation(jacksonLibs.jackson.databind)
16-
implementation(jacksonLibs.jackson.jsr310)
13+
implementation(libs.jackson.core)
14+
implementation(libs.jackson.databind)
15+
implementation(libs.jackson.jsr310)
1716

1817
// Required for the annotations
19-
compileOnly("org.apache.tomcat:annotations-api:6.0.53")
20-
compileOnly("com.google.code.findbugs:jsr305:3.0.2")
18+
compileOnly(libs.tomcat.annotations)
19+
compileOnly(libs.google.findbugs.jsr305)
2120
}
2221

2322
// Add generated output to source sets

build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ plugins {
55
id("org.jetbrains.dokka") version "1.9.20"
66

77
// https://github.com/gradle/gradle/issues/20084#issuecomment-1060822638
8-
id(pluginLibs.plugins.spotless.get().pluginId) apply false
8+
id(libs.plugins.spotless.get().pluginId) apply false
99
}
1010

11-
// Dokka is bringing in jackson unshaded and it's messing up other plugins, so we override those
11+
// Dokka is bringing in jackson unshaded, and it's messing up other plugins, so we override those
1212
// here!
1313
buildscript {
1414
dependencies {
@@ -25,7 +25,6 @@ buildscript {
2525
}
2626
}
2727

28-
val protobufVersion = coreLibs.versions.protobuf.get()
2928
val restateVersion = libs.versions.restate.get()
3029

3130
allprojects {

examples/build.gradle.kts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransf
44
plugins {
55
`java-conventions`
66
`kotlin-conventions`
7-
alias(kotlinLibs.plugins.ksp)
7+
alias(libs.plugins.ksp)
88
application
9-
id("com.github.johnrengelman.shadow").version("8.1.1")
9+
alias(libs.plugins.shadow)
1010
}
1111

1212
dependencies {
@@ -19,17 +19,15 @@ dependencies {
1919
implementation(project(":sdk-api-kotlin"))
2020
implementation(project(":sdk-serde-jackson"))
2121

22-
implementation(platform(jacksonLibs.jackson.bom))
23-
implementation(jacksonLibs.jackson.jsr310)
24-
implementation(jacksonLibs.jackson.parameter.names)
22+
implementation(libs.jackson.jsr310)
23+
implementation(libs.jackson.parameter.names)
2524

26-
implementation(kotlinLibs.kotlinx.coroutines)
27-
implementation(kotlinLibs.kotlinx.serialization.core)
28-
implementation(kotlinLibs.kotlinx.serialization.json)
25+
implementation(libs.kotlinx.coroutines.core)
26+
implementation(libs.kotlinx.serialization.core)
27+
implementation(libs.kotlinx.serialization.json)
2928

30-
implementation(coreLibs.log4j.core)
31-
implementation(platform(vertxLibs.vertx.bom))
32-
implementation(vertxLibs.vertx.core)
29+
implementation(libs.log4j.core)
30+
implementation(libs.vertx.core)
3331
}
3432

3533
application {

gradle/libs.versions.toml

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,70 @@
11
[versions]
2-
restate = '1.3.0-SNAPSHOT'
2+
jackson = "2.18.1"
3+
victools-json-schema = "4.37.0"
4+
ksp = "2.0.21-1.0.28"
5+
protobuf = "4.28.3"
6+
opentelemetry = "1.44.1"
7+
vertx = "4.5.11"
8+
dokka = "1.9.20"
9+
kotlinx-serialization = "1.7.3"
10+
kotlinx-coroutines = "1.9.0"
11+
junit = "5.10.2"
12+
spring-boot = "3.3.5"
13+
log4j = "2.24.1"
14+
restate = "1.3.0-SNAPSHOT"
15+
16+
[libraries]
17+
aws-lambda-core = "com.amazonaws:aws-lambda-java-core:1.2.3"
18+
aws-lambda-events = "com.amazonaws:aws-lambda-java-events:3.11.5"
19+
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
20+
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
21+
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
22+
jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
23+
jackson-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson" }
24+
jackson-parameter-names = { module = "com.fasterxml.jackson.module:jackson-module-parameter-names", version.ref = "jackson" }
25+
handlebars = "com.github.jknack:handlebars:4.3.1"
26+
victools-jsonschema-generator = { module = "com.github.victools:jsonschema-generator", version.ref = "victools-json-schema" }
27+
victools-jsonschema-module-jackson = { module = "com.github.victools:jsonschema-module-jackson", version.ref = "victools-json-schema" }
28+
google-findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
29+
tink = "com.google.crypto.tink:tink:1.15.0"
30+
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
31+
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
32+
protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
33+
protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
34+
jwt = "com.nimbusds:nimbus-jose-jwt:9.47"
35+
opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry" }
36+
opentelemetry-kotlin = { module = "io.opentelemetry:opentelemetry-extension-kotlin", version.ref = "opentelemetry" }
37+
reactiverse-contextual-logging = "io.reactiverse:reactiverse-contextual-logging:1.2.1"
38+
mutiny = "io.smallrye.reactive:mutiny:2.6.0"
39+
vertx-core = { module = "io.vertx:vertx-core", version.ref = "vertx" }
40+
vertx-junit5 = { module = "io.vertx:vertx-junit5", version.ref = "vertx" }
41+
vertx-kotlin-coroutines = { module = "io.vertx:vertx-lang-kotlin-coroutines", version.ref = "vertx" }
42+
log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
43+
log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
44+
tomcat-annotations = "org.apache.tomcat:annotations-api:6.0.53"
45+
assertj = "org.assertj:assertj-core:3.26.0"
46+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
47+
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
48+
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
49+
jspecify = "org.jspecify:jspecify:1.0.0"
50+
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
51+
junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
52+
slf4j-nop = "org.slf4j:slf4j-nop:1.7.32"
53+
spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "spring-boot" }
54+
spring-boot-starter-json = { module = "org.springframework.boot:spring-boot-starter-json", version.ref = "spring-boot" }
55+
spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "spring-boot" }
56+
testcontainers = "org.testcontainers:testcontainers:1.20.3"
57+
58+
[plugins]
59+
dependency-license-report = "com.github.jk1.dependency-license-report:2.0"
60+
shadow = "com.github.johnrengelman.shadow:8.1.1"
61+
jib = "com.google.cloud.tools.jib:3.2.1"
62+
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
63+
protobuf = "com.google.protobuf:0.9.4"
64+
aggregate-javadoc = "io.freefair.aggregate-javadoc:8.6"
65+
gradle-nexus-publish-plugin = "io.github.gradle-nexus.publish-plugin:1.3.0"
66+
spring-dependency-management = "io.spring.dependency-management:1.1.6"
67+
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
68+
jsonschema2pojo = "org.jsonschema2pojo:1.2.1"
69+
openapi-generator = "org.openapi.generator:7.5.0"
70+
spotless = "com.diffplug.spotless:6.25.0"

sdk-aggregated-javadocs/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
plugins { id("io.freefair.aggregate-javadoc") version "8.6" }
1+
plugins { alias(libs.plugins.aggregate.javadoc) }
22

33
rootProject.subprojects
44
.filter { it.name != "examples" }

sdk-api-gen-common/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ plugins {
77
description = "Restate SDK API Gen Common"
88

99
dependencies {
10-
compileOnly(coreLibs.jspecify)
10+
compileOnly(libs.jspecify)
1111

12-
api("com.github.jknack:handlebars:4.3.1")
12+
api(libs.handlebars)
1313
api(project(":sdk-common"))
1414

1515
// We need it to silence the slf4j warning (coming from handlebars)
16-
runtimeOnly("org.slf4j:slf4j-nop:1.7.32")
16+
runtimeOnly(libs.slf4j.nop)
1717
}

sdk-api-gen/build.gradle.kts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,20 @@ plugins {
88
description = "Restate SDK API Gen"
99

1010
dependencies {
11-
compileOnly(coreLibs.jspecify)
11+
compileOnly(libs.jspecify)
1212

1313
implementation(project(":sdk-api-gen-common"))
1414
implementation(project(":sdk-api"))
1515

1616
testAnnotationProcessor(project(":sdk-api-gen"))
1717
testImplementation(project(":sdk-core"))
18-
testImplementation(testingLibs.junit.jupiter)
19-
testImplementation(testingLibs.assertj)
20-
testImplementation(coreLibs.protobuf.java)
21-
testImplementation(coreLibs.log4j.core)
22-
testImplementation(platform(jacksonLibs.jackson.bom))
23-
testImplementation(jacksonLibs.jackson.databind)
18+
testImplementation(libs.junit.jupiter)
19+
testImplementation(libs.assertj)
20+
testImplementation(libs.protobuf.java)
21+
testImplementation(libs.log4j.core)
22+
testImplementation(libs.jackson.databind)
2423
testImplementation(project(":sdk-serde-jackson"))
25-
testImplementation("io.smallrye.reactive:mutiny:2.6.0")
24+
testImplementation(libs.mutiny)
2625

2726
// Import test suites from sdk-core
2827
testImplementation(project(":sdk-core", "testArchive"))

sdk-api-kotlin-gen/build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@ plugins {
22
`kotlin-conventions`
33
`test-jar-conventions`
44
`library-publishing-conventions`
5-
alias(kotlinLibs.plugins.ksp)
5+
alias(libs.plugins.ksp)
66
}
77

88
description = "Restate SDK API Kotlin Gen"
99

1010
dependencies {
11-
compileOnly(coreLibs.jspecify)
11+
compileOnly(libs.jspecify)
1212

13-
implementation(kotlinLibs.symbol.processing.api)
13+
implementation(libs.ksp.api)
1414
implementation(project(":sdk-api-gen-common"))
1515

1616
implementation(project(":sdk-api-kotlin"))
1717

1818
kspTest(project(":sdk-api-kotlin-gen"))
1919
testImplementation(project(":sdk-core"))
20-
testImplementation(testingLibs.junit.jupiter)
21-
testImplementation(testingLibs.assertj)
22-
testImplementation(coreLibs.protobuf.java)
23-
testImplementation(coreLibs.log4j.core)
24-
testImplementation(kotlinLibs.kotlinx.coroutines)
25-
testImplementation(kotlinLibs.kotlinx.serialization.core)
26-
testImplementation("io.smallrye.reactive:mutiny:2.6.0")
20+
testImplementation(libs.junit.jupiter)
21+
testImplementation(libs.assertj)
22+
testImplementation(libs.protobuf.java)
23+
testImplementation(libs.log4j.core)
24+
testImplementation(libs.kotlinx.coroutines.core)
25+
testImplementation(libs.kotlinx.serialization.core)
26+
testImplementation(libs.mutiny)
2727

2828
// Import test suites from sdk-core
2929
testImplementation(project(":sdk-core", "testArchive"))

0 commit comments

Comments
 (0)