Skip to content

Commit f696d6a

Browse files
committed
run tests on JDK 21
1 parent 2239c5c commit f696d6a

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/actions/setup-gradle/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
8
3333
11
3434
17
35-
20
35+
21
3636
- name: Setup gradle
3737
uses: gradle/gradle-build-action@v2
3838
with:

.github/workflows/run-tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ jobs:
1313
uses: gradle/gradle-build-action@v2
1414
with:
1515
arguments: |
16-
jvmTest
17-
jvm11Test
18-
jvm17Test
19-
jvm20Test
16+
jvmAllTest
2017
--scan
2118
--info
2219
--continue

gradle/plugins/build-logic/src/main/kotlin/rsocket.target.jvm.gradle.kts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2023 the original author or authors.
2+
* Copyright 2015-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,13 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17+
import org.jetbrains.kotlin.gradle.targets.jvm.tasks.*
18+
1719
plugins {
1820
id("rsocket.multiplatform")
1921
}
2022

2123
kotlin {
2224
jvm {
23-
listOf(11, 17, 20).forEach { jdkVersion ->
25+
listOf(11, 17, 21).forEach { jdkVersion ->
2426
testRuns.create("${jdkVersion}Test") {
2527
executionTask.configure {
2628
javaLauncher.set(
@@ -40,3 +42,8 @@ kotlin {
4042
}
4143
}
4244
}
45+
46+
tasks.register("jvmAllTest") {
47+
group = "verification"
48+
dependsOn(tasks.withType<KotlinJvmTest>())
49+
}

0 commit comments

Comments
 (0)