Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for building projects using JDK 21 #237

Merged
merged 1 commit into from
Oct 13, 2023
Merged

Add support for building projects using JDK 21 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions coordinator/configs/projects-config.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ losizm_scamper{
makiftutuncu_effect.tests = compile-only
markehammons_slinc {
tests = compile-only
java.version = 20
java.version = 21
}
mateuszkubuszok_pipez{
source-patches = [
Expand Down Expand Up @@ -650,7 +650,7 @@ softwaremill_akka-http-session {
]
}
softwaremill_ox {
java.version=20
java.version=21
sbt.options = ["-J--enable-preview" "-J--add-modules" "jdk.incubator.concurrent"]
}
softwaremill_sttp {
Expand All @@ -677,7 +677,7 @@ softwaremill_tapir {
}
}
softwaremill_tapir-loom {
java.version=20
java.version=21
}
svroonland_rezilience.tests = compile-only
svroonland_zio-kinesis.tests = compile-only
Expand Down
2 changes: 1 addition & 1 deletion coordinator/src/main/scala/ProjectConfigDiscovery.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class ProjectConfigDiscovery(internalProjectConfigsPath: java.io.File) {
val JavaVersionDistroVer = raw"$OptQuote(\w+)[@:]([\d\.]*[\w\-\_\.]*)$OptQuote".r
val MatrixEntry = raw"(\w+):\s*\[(.*)\]".r
// We can only supported this versions
val allowedVersions = Seq(8, 11, 17, 20)
val allowedVersions = Seq(8, 11, 17, 21)

def isJavaVersionMatrixEntry(key: String): Boolean = {
Set("java", "jdk", "jvm", "release").contains(key.toLowerCase)
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ VERSION="$1"
export PREV_CB_VERSION="v0.2.7"

javaDefault=11
javaAccessoryVersions=(8 17 20)
javaAccessoryVersions=(8 17 21)
scriptDir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"

if [[ ! -z "${BUILD_ONLY_DEFAULT_JDK}" ]]; then
Expand Down
8 changes: 4 additions & 4 deletions scripts/build-builder-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ case $JDK_VERSION in
;;

"11")
jdkDistro="11.0.17-tem"
jdkDistro="11.0.20-tem"
;;

"17")
jdkDistro="17.0.5-tem "
jdkDistro="17.0.8-tem "
;;

"20")
jdkDistro="20.0.1-tem"
"21")
jdkDistro="21-tem"
;;

*)
Expand Down
2 changes: 1 addition & 1 deletion scripts/publish-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi

VERSION="$1"

javaVersions=(8 11 17 20)
javaVersions=(8 11 17 21)
scriptDir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"

BUILDER_BASE=virtuslab/scala-community-build-builder-base
Expand Down
2 changes: 1 addition & 1 deletion scripts/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function scbk() {

function checkJavaVersion() {
version="$1"
supportedVersions=(8 11 17 20)
supportedVersions=(8 11 17 21)

if [ -z "$version" ]; then
echo >&2 "Java version has to be set"
Expand Down