Skip to content

Commit

Permalink
chore: upgrade sbt 1.9.7
Browse files Browse the repository at this point in the history
Motivation:

Gatling 3.10 baseline is moving to Java 11.
CI is upgraded to Java 21.
  • Loading branch information
slandelle committed Nov 11, 2023
1 parent 7059988 commit 4b4bbca
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '8'
java-version: '21'

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

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

- name: Prepare environment
env:
Expand Down
4 changes: 3 additions & 1 deletion project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ import io.gatling.build.license.Apache2LicenseFilePlugin.Apache2LicenseFileKeys.
import sbt._
import sbt.Keys._
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
import _root_.io.gatling.build.compile.GatlingCompilerSettingsPlugin.GatlingCompilerSettingsKey._

object BuildSettings {
lazy val basicSettings = Seq(
organization := "io.gatling.highcharts",
headerLicense := GatlingHighChartsLicense,
licenses := Seq("Gatling Highcharts" -> url("https://raw.githubusercontent.com/gatling/gatling-highcharts/master/LICENSE")),
gatlingCompilerRelease := Some(11),
// Avoid to write the Apache2 license
Compile / gatlingApache2LicenseTask := Seq.empty
Compile / gatlingApache2LicenseTask := Nil
)
}
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("io.gatling" % "gatling-build-plugin" % "5.2.1")
addSbtPlugin("io.gatling" % "gatling-build-plugin" % "5.3.0")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.1.4")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.1.5")

0 comments on commit 4b4bbca

Please sign in to comment.