Skip to content

Commit

Permalink
chore: match package Java-Version to current compile release, close R…
Browse files Browse the repository at this point in the history
…NG-46
  • Loading branch information
notdryft committed Oct 1, 2024
1 parent f8a6eab commit 7e88f8d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion js/cli/src/enterprise.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const generateManifest = (simulationNames: string[]) => {
"Gatling-Packager: js-cli",
`Gatling-Packager-Version: ${versions.gatling.jsAdapter}`,
`Gatling-Simulations: ${simulationNames.join(",")}`,
`Java-Version: ${versions.graalvm.jdk.split(".")[0]}`
`Java-Version: ${versions.java.compilerRelease}`
];
const pkg = getPackageNameAndVersion();
lines.push(`Implementation-Title: ${pkg.name}`);
Expand Down
6 changes: 5 additions & 1 deletion jvm/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Global / gatlingDevelopers := Seq(
GatlingDeveloper("[email protected]", "Guillaume Galy", isGatlingCorp = true)
)

val compilerRelease = 21
val graalvmJdkVersion = "23.0.0"
val graalvmJsVersion = "24.1.0"
val coursierVersion = "2.1.12"
Expand All @@ -29,7 +30,7 @@ lazy val adapter = (project in file("adapter"))
.enablePlugins(GatlingOssPlugin)
.settings(
name := "gatling-jvm-to-js-adapter",
gatlingCompilerRelease := 21,
gatlingCompilerRelease := compilerRelease,
Compile / javacOptions ++= Seq("-encoding", "utf8", "-Xdoclint:none"), // FIXME: see why -Xdoclint:none does not seem to work
Test / javacOptions ++= Seq("-encoding", "utf8"),
spotless := SpotlessConfig(
Expand All @@ -53,6 +54,9 @@ lazy val adapter = (project in file("adapter"))
| jdk: "$graalvmJdkVersion",
| js: "$graalvmJsVersion"
| },
| java: {
| compilerRelease: "$compilerRelease"
| },
| coursier: "$coursierVersion",
| gatling: {
| core: "$gatlingVersion",
Expand Down

0 comments on commit 7e88f8d

Please sign in to comment.