Skip to content

Commit 52abb78

Browse files
authored
Move the declaration of additional test Java versions to gradle.properties (#2211)
1 parent 86c9718 commit 52abb78

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/common.main.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ data class Matrix(
8585

8686
data class Axes(
8787
val javaVersions: List<String>,
88+
val additionalJavaTestVersions: List<String>,
8889
val variants: List<String>
8990
)
9091

@@ -137,7 +138,7 @@ val Matrix.Companion.full
137138
get() = Matrix(
138139
operatingSystems = listOf("ubuntu-latest"),
139140
variants = axes.variants,
140-
javaVersions = axes.javaVersions + "23",
141+
javaVersions = axes.javaVersions + axes.additionalJavaTestVersions,
141142
exclude = { (variant == "2.5") && (javaVersion!!.toInt() >= 17) },
142143
includes = listOf("windows-latest", "macos-latest")
143144
.map {
@@ -159,6 +160,7 @@ val Matrix.Companion.axes by lazy {
159160

160161
Matrix.Axes(
161162
properties.getList("javaVersionsList"),
163+
properties.getList("additionalJavaTestVersionsList"),
162164
properties.getList("variantsList")
163165
)
164166
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ org.gradle.parallel=true
2121
org.gradle.caching=true
2222

2323
javaVersionsList=8, 11, 17, 21
24+
additionalJavaTestVersionsList=23
2425
variantsList=2.5, 3.0, 4.0
2526
kotlin.code.style=official

0 commit comments

Comments
 (0)