chore: compile with Java 21 and emit bytecode for Java 11

gatling · Dec 10, 2023 · 5f5ec2f · 5f5ec2f
1 parent 5f64320
commit 5f5ec2f
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '8'
+          java-version: '21'
           cache: 'sbt'
 
       - name: Test

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '8'
+          java-version: '21'
 
       - name: Prepare environment
         env:

diff --git a/build.sbt b/build.sbt
@@ -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,
@@ -24,7 +25,7 @@ scriptedLaunchOpts := {
 
 scriptedBufferLog := false
 
-pluginCrossBuild / sbtVersion := "1.5.5"
+pluginCrossBuild / sbtVersion := "1.9.7"
 gatlingDevelopers := Seq(
   GatlingDeveloper(
     "slandelle@gatling.io",

diff --git a/src/sbt-test/gatling-sbt/copyConfigFiles/build.sbt b/src/sbt-test/gatling-sbt/copyConfigFiles/build.sbt
@@ -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"
diff --git a/src/sbt-test/gatling-sbt/copyConfigFiles/project/build.properties b/src/sbt-test/gatling-sbt/copyConfigFiles/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.0
+sbt.version=1.9.7
diff --git a/src/sbt-test/gatling-sbt/enterpriseAssembly/build.sbt b/src/sbt-test/gatling-sbt/enterpriseAssembly/build.sbt
@@ -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"
diff --git a/src/sbt-test/gatling-sbt/enterpriseAssembly/project/build.properties b/src/sbt-test/gatling-sbt/enterpriseAssembly/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.0
+sbt.version=1.9.7
diff --git a/src/sbt-test/gatling-sbt/runTests/build.sbt b/src/sbt-test/gatling-sbt/runTests/build.sbt
@@ -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"

diff --git a/src/sbt-test/gatling-sbt/runTests/project/build.properties b/src/sbt-test/gatling-sbt/runTests/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.0
+sbt.version=1.9.7