Skip to content

Commit 1eaa618

Browse files
fgrutschkwark
authored andcommitted
#49 add scala 2.13.0 support (#50)
1 parent 28c2794 commit 1eaa618

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ project/plugins/project/
1919
.worksheet
2020
.idea
2121

22+
23+
# scala metals specific
24+
.metals
25+
.bloop

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: scala
22
scala:
33
- 2.11.12
44
- 2.12.8
5+
- 2.13.0
56
script:
67
- sbt "++ $TRAVIS_SCALA_VERSION test"
78
sudo: false

build.sbt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,25 @@ scalacOptions in ThisBuild := {
1313
"-feature", // warning and location for usages of features that should be imported explicitly
1414
"-unchecked", // additional warnings where generated code depends on assumptions
1515
"-Xlint", // recommended additional warnings
16-
"-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver
1716
"-Ywarn-value-discard", // Warn when non-Unit expression results are unused
18-
"-Ywarn-inaccessible",
1917
// "-Ywarn-dead-code",
2018
// "-Xfatal-warnings",
2119
"-language:reflectiveCalls",
2220
"-Ydelambdafy:method"
2321
)
24-
if (scalaVersion.value.startsWith("2.11")) commonOptions ++ Seq("-Ybackend:GenBCode")
25-
else commonOptions
22+
23+
scalaVersion.value match {
24+
case v: String if v startsWith "2.13" => Seq()
25+
case v: String if v startsWith "2.12" => Seq(
26+
"-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver,
27+
"-Ywarn-inaccessible"
28+
)
29+
case v: String if v startsWith "2.11" => Seq(
30+
"-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver
31+
"-Ywarn-inaccessible",
32+
"-Ybackend:GenBCode"
33+
)
34+
}
2635
}
2736

2837
lazy val akkaPersistencePgModule = {
@@ -59,7 +68,7 @@ lazy val benchmarkModule = {
5968
.configs(GatlingIt)
6069
.settings(Defaults.coreDefaultSettings ++ commonSettings ++ Seq(skip in publish := true))
6170

62-
.settings(crossScalaVersions := (crossScalaVersions in ThisBuild).value.filter(_ startsWith "2.12"))
71+
.settings(crossScalaVersions := (crossScalaVersions in ThisBuild).value.filter(_ startsWith "2.13"))
6372
.settings(scalaVersion := crossScalaVersions.value.last)
6473

6574

project/Dependencies.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import sbt._
22

33
object Dependencies {
44

5-
val akkaVersion = "2.5.22"
6-
val slickVersion = "3.3.0"
5+
val akkaVersion = "2.5.23"
6+
val slickVersion = "3.3.2"
77
val gatlingVersion = "2.2.4"
88

99
val scalaJava8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.0"
@@ -18,7 +18,7 @@ object Dependencies {
1818
val slickHikariCp = "com.typesafe.slick" %% "slick-hikaricp" % slickVersion
1919

2020
// Test dependencies
21-
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.7" % "test,it"
21+
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.8" % "test,it"
2222
val akkaTest = "com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test,it"
2323
val akkaPersistenceTestkit = "com.typesafe.akka" %% "akka-persistence-tck" % akkaVersion % "test,it"
2424
val slf4jSimple = "org.slf4j" % "slf4j-simple" % "1.7.26" % "test,it"
@@ -28,7 +28,7 @@ object Dependencies {
2828
val gatlinHighcharts = "io.gatling.highcharts" % "gatling-charts-highcharts" % gatlingVersion
2929
val gatling = "io.gatling" % "gatling-test-framework" % gatlingVersion
3030

31-
val postgres = "org.postgresql" % "postgresql" % "42.2.5"
31+
val postgres = "org.postgresql" % "postgresql" % "42.2.6"
3232

3333
val mainTestDependencies = Seq (
3434
scalaTest, akkaSlf4j, tyrex

0 commit comments

Comments
 (0)