Skip to content

Commit

Permalink
Bump sbt, JVM and dependencies versions
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackAnubis7 committed Nov 8, 2022
1 parent 7d14809 commit 3ff1de1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Run tests
run: sbt test
20 changes: 12 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ enablePlugins(GatlingPlugin)

name := "EShop"

version := "0.3"
version := "0.4"

scalaVersion := "2.13.6"

val akkaVersion = "2.6.16"
val akkaHttpVersion = "10.2.6"
val akkaVersion = "2.7.0"
val akkaHttpVersion = "10.4.0"

libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
Expand All @@ -24,13 +24,17 @@ libraryDependencies ++= Seq(
"org.iq80.leveldb" % "leveldb" % "0.12",
"org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8",
"com.github.dnvriend" %% "akka-persistence-inmemory" % "2.5.15.2",
"org.scalatest" %% "scalatest" % "3.2.9" % "test",
"ch.qos.logback" % "logback-classic" % "1.2.6",
"io.gatling" % "gatling-http" % "3.5.1"
"org.scalatest" %% "scalatest" % "3.2.14" % "test",
"ch.qos.logback" % "logback-classic" % "1.4.4",
"io.gatling" % "gatling-http" % "3.8.4"
)

libraryDependencies += "io.gatling.highcharts" % "gatling-charts-highcharts" % "3.5.1" % "test,it"
libraryDependencies += "io.gatling" % "gatling-test-framework" % "3.5.1" % "test,it"
dependencyOverrides ++= List(
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1",
)

libraryDependencies += "io.gatling.highcharts" % "gatling-charts-highcharts" % "3.8.4" % "test,it"
libraryDependencies += "io.gatling" % "gatling-test-framework" % "3.8.4" % "test,it"

// scalaFmt
scalafmtOnCompile := true
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.5
sbt.version=1.7.1

0 comments on commit 3ff1de1

Please sign in to comment.