Skip to content

Commit

Permalink
chore: compile with Java 21 and emit bytecode for Java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
slandelle committed Dec 10, 2023
1 parent 5f64320 commit 5f5ec2f
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '8'
java-version: '21'
cache: 'sbt'

- name: Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '8'
java-version: '21'

- name: Prepare environment
env:
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ name := "gatling-sbt"
scalaVersion := "2.12.18"
sbtPlugin := true
githubPath := "gatling/gatling-sbt-plugin"
gatlingCompilerRelease := Some(11)

libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.2.17" % Test,
Expand All @@ -24,7 +25,7 @@ scriptedLaunchOpts := {

scriptedBufferLog := false

pluginCrossBuild / sbtVersion := "1.5.5"
pluginCrossBuild / sbtVersion := "1.9.7"
gatlingDevelopers := Seq(
GatlingDeveloper(
"[email protected]",
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/gatling-sbt/copyConfigFiles/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
enablePlugins(GatlingPlugin)

scalaVersion := "2.12.11"
scalaVersion := "2.13.12"

val gatlingVersion = "3.3.0"
val gatlingVersion = "3.9.5"

libraryDependencies += "io.gatling.highcharts" % "gatling-charts-highcharts" % gatlingVersion % "it,test"
libraryDependencies += "io.gatling" % "gatling-test-framework" % gatlingVersion % "it,test"
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.0
sbt.version=1.9.7
4 changes: 2 additions & 2 deletions src/sbt-test/gatling-sbt/enterpriseAssembly/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ enablePlugins(GatlingPlugin)
name := "my-test-project"
version := "1.2.3"

scalaVersion := "2.12.11"
scalaVersion := "2.13.12"

val gatlingVersion = "3.3.0"
val gatlingVersion = "3.9.5"

libraryDependencies += "io.gatling.highcharts" % "gatling-charts-highcharts" % gatlingVersion % "it,test"
libraryDependencies += "io.gatling" % "gatling-test-framework" % gatlingVersion % "it,test"
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.0
sbt.version=1.9.7
4 changes: 2 additions & 2 deletions src/sbt-test/gatling-sbt/runTests/build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
enablePlugins(GatlingPlugin)

scalaVersion := "2.12.12"
scalaVersion := "2.13.12"

val gatlingVersion = "3.4.1"
val gatlingVersion = "3.9.5"

libraryDependencies += "io.gatling.highcharts" % "gatling-charts-highcharts" % gatlingVersion % "it,test"
libraryDependencies += "io.gatling" % "gatling-test-framework" % gatlingVersion % "it,test"
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/gatling-sbt/runTests/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.0
sbt.version=1.9.7

0 comments on commit 5f5ec2f

Please sign in to comment.