From 5f5ec2f5c09c219fe39cfb79fe91189b4724385f Mon Sep 17 00:00:00 2001 From: slandelle Date: Sun, 10 Dec 2023 22:11:10 +0100 Subject: [PATCH] chore: compile with Java 21 and emit bytecode for Java 11 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- build.sbt | 3 ++- src/sbt-test/gatling-sbt/copyConfigFiles/build.sbt | 4 ++-- .../gatling-sbt/copyConfigFiles/project/build.properties | 2 +- src/sbt-test/gatling-sbt/enterpriseAssembly/build.sbt | 4 ++-- .../gatling-sbt/enterpriseAssembly/project/build.properties | 2 +- src/sbt-test/gatling-sbt/runTests/build.sbt | 4 ++-- src/sbt-test/gatling-sbt/runTests/project/build.properties | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb6b954..7d1ad97 100644 --- 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 index 3a1ff26..83f4fa5 100644 --- 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 index 557f519..3048b95 100644 --- 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 index 9ab266b..c70e578 100644 --- 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 index 1e70b0c..e8a1e24 100644 --- 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 index 6048752..37531a8 100644 --- 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 index 1e70b0c..e8a1e24 100644 --- 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 index ac68b4d..5437bdf 100644 --- 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 index 1e70b0c..e8a1e24 100644 --- 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