Skip to content

Commit d48e074

Browse files
Test Java 25 (#561)
* Test Java 25 * Bump gradle to 9, bump bunch of deps * Update gradle to 9.3 * Update usages of junit platform launcher * Bump spotless * Spotless goes wild
1 parent 0dec034 commit d48e074

58 files changed

Lines changed: 655 additions & 420 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
java: [ 17, 21 ]
18+
java: [ 17, 21, 25 ]
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Set up JDK ${{ matrix.java }}

build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ allprojects {
6565
filters =
6666
arrayOf(
6767
com.github.jk1.license.filter.LicenseBundleNormalizer(
68-
"$rootDir/config/license-normalizer-bundle.json", true))
68+
"$rootDir/config/license-normalizer-bundle.json",
69+
true,
70+
)
71+
)
6972
}
7073
}
7174

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ repositories {
1111
dependencies {
1212
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10")
1313
implementation("org.jetbrains.kotlin:kotlin-serialization:2.2.10")
14-
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
14+
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.2.0")
1515
}

bytebuddy-proxy-support/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616

1717
testImplementation(libs.junit.jupiter)
1818
testImplementation(libs.assertj)
19+
testRuntimeOnly(libs.junit.platform.launcher)
1920
}
2021

2122
tasks.withType<Javadoc> { isFailOnError = false }

client-kotlin/src/main/kotlin/dev/restate/client/kotlin/ingress.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ suspend fun <Req, Res> Client.callSuspend(request: Request<Req, Res>): Response<
5656
*/
5757
suspend fun <Req, Res> Request<Req, Res>.send(
5858
client: Client,
59-
delay: Duration? = null
59+
delay: Duration? = null,
6060
): SendResponse<Res> {
6161
return client.sendSuspend(this, delay)
6262
}
@@ -67,7 +67,7 @@ suspend fun <Req, Res> Request<Req, Res>.send(
6767
*/
6868
suspend fun <Req, Res> Client.sendSuspend(
6969
request: Request<Req, Res>,
70-
delay: Duration? = null
70+
delay: Duration? = null,
7171
): SendResponse<Res> {
7272
return this.sendAsync(request, delay?.toJavaDuration()).await()
7373
}
@@ -81,15 +81,15 @@ suspend fun <Req, Res> Client.sendSuspend(
8181
*/
8282
suspend fun <Req, Res> WorkflowRequest<Req, Res>.submit(
8383
client: Client,
84-
delay: Duration? = null
84+
delay: Duration? = null,
8585
): SendResponse<Res> {
8686
return client.submitSuspend(this, delay)
8787
}
8888

8989
/** Submit a workflow, optionally providing an execution delay to wait for. */
9090
suspend fun <Req, Res> Client.submitSuspend(
9191
request: WorkflowRequest<Req, Res>,
92-
delay: Duration? = null
92+
delay: Duration? = null,
9393
): SendResponse<Res> {
9494
return this.submitAsync(request, delay?.toJavaDuration()).await()
9595
}
@@ -104,7 +104,7 @@ suspend fun <Req, Res> Client.submitSuspend(
104104
suspend fun <T : Any> Client.AwakeableHandle.resolveSuspend(
105105
typeTag: TypeTag<T>,
106106
payload: T,
107-
options: RequestOptions = RequestOptions.DEFAULT
107+
options: RequestOptions = RequestOptions.DEFAULT,
108108
): Response<Void> {
109109
return this.resolveAsync(typeTag, payload, options).await()
110110
}
@@ -117,7 +117,7 @@ suspend fun <T : Any> Client.AwakeableHandle.resolveSuspend(
117117
*/
118118
suspend inline fun <reified T : Any> Client.AwakeableHandle.resolveSuspend(
119119
payload: T,
120-
options: RequestOptions = RequestOptions.DEFAULT
120+
options: RequestOptions = RequestOptions.DEFAULT,
121121
): Response<Void> {
122122
return this.resolveSuspend(typeTag<T>(), payload, options)
123123
}
@@ -130,7 +130,7 @@ suspend inline fun <reified T : Any> Client.AwakeableHandle.resolveSuspend(
130130
*/
131131
suspend fun Client.AwakeableHandle.rejectSuspend(
132132
reason: String,
133-
options: RequestOptions = RequestOptions.DEFAULT
133+
options: RequestOptions = RequestOptions.DEFAULT,
134134
): Response<Void> {
135135
return this.rejectAsync(reason, options).await()
136136
}
@@ -180,7 +180,7 @@ suspend fun <T : Any?> Client.InvocationHandle<T>.getOutputSuspend(
180180
*/
181181
inline fun <reified Res> Client.idempotentInvocationHandle(
182182
target: Target,
183-
idempotencyKey: String
183+
idempotencyKey: String,
184184
): Client.IdempotentInvocationHandle<Res> {
185185
return this.idempotentInvocationHandle(target, idempotencyKey, typeTag<Res>())
186186
}
@@ -218,7 +218,7 @@ suspend fun <T> Client.IdempotentInvocationHandle<T>.getOutputSuspend(
218218
*/
219219
inline fun <reified Res> Client.workflowHandle(
220220
workflowName: String,
221-
workflowId: String
221+
workflowId: String,
222222
): Client.WorkflowHandle<Res> {
223223
return this.workflowHandle(workflowName, workflowId, typeTag<Res>())
224224
}

gradle/libs.versions.toml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@
5858
[libraries.junit-jupiter.version]
5959
ref = 'junit'
6060

61+
[libraries.junit-platform-launcher]
62+
module = 'org.junit.platform:junit-platform-launcher'
63+
# TODO align this with ref = junit once bumped to junit 6
64+
version = '1.14.2'
65+
6166
[libraries.kotlinx-coroutines-core]
6267
module = 'org.jetbrains.kotlinx:kotlinx-coroutines-core'
6368

@@ -209,7 +214,7 @@
209214
jib = 'com.google.cloud.tools.jib:3.4.5'
210215
jsonschema2pojo = 'org.jsonschema2pojo:1.2.2'
211216
nexus-publish = 'io.github.gradle-nexus.publish-plugin:1.3.0'
212-
openapi-generator = 'org.openapi.generator:7.5.0'
217+
openapi-generator = 'org.openapi.generator:7.17.0'
213218
protobuf = 'com.google.protobuf:0.9.4'
214219
shadow = 'com.gradleup.shadow:9.0.0-beta8'
215220
spotless = 'com.diffplug.spotless:7.2.1'
@@ -223,7 +228,7 @@
223228

224229
[versions]
225230
jackson = '2.18.4'
226-
junit = '5.10.2'
231+
junit = '5.14.1'
227232
kotlinx-coroutines = '1.10.2'
228233
kotlinx-serialization = '1.9.0'
229234
ksp = '2.2.10-2.0.2'

gradle/wrapper/gradle-wrapper.jar

2 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)