Skip to content

Commit

Permalink
#49 add scala 2.13.0 support (#50)
Browse files Browse the repository at this point in the history
  • Loading branch information
fgrutsch authored and kwark committed Jun 21, 2019
1 parent 28c2794 commit 1eaa618
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ project/plugins/project/
.worksheet
.idea


# scala metals specific
.metals
.bloop
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: scala
scala:
- 2.11.12
- 2.12.8
- 2.13.0
script:
- sbt "++ $TRAVIS_SCALA_VERSION test"
sudo: false
Expand Down
19 changes: 14 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,25 @@ scalacOptions in ThisBuild := {
"-feature", // warning and location for usages of features that should be imported explicitly
"-unchecked", // additional warnings where generated code depends on assumptions
"-Xlint", // recommended additional warnings
"-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver
"-Ywarn-value-discard", // Warn when non-Unit expression results are unused
"-Ywarn-inaccessible",
// "-Ywarn-dead-code",
// "-Xfatal-warnings",
"-language:reflectiveCalls",
"-Ydelambdafy:method"
)
if (scalaVersion.value.startsWith("2.11")) commonOptions ++ Seq("-Ybackend:GenBCode")
else commonOptions

scalaVersion.value match {
case v: String if v startsWith "2.13" => Seq()
case v: String if v startsWith "2.12" => Seq(
"-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver,
"-Ywarn-inaccessible"
)
case v: String if v startsWith "2.11" => Seq(
"-Ywarn-adapted-args", // Warn if an argument list is modified to match the receiver
"-Ywarn-inaccessible",
"-Ybackend:GenBCode"
)
}
}

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

.settings(crossScalaVersions := (crossScalaVersions in ThisBuild).value.filter(_ startsWith "2.12"))
.settings(crossScalaVersions := (crossScalaVersions in ThisBuild).value.filter(_ startsWith "2.13"))
.settings(scalaVersion := crossScalaVersions.value.last)


Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import sbt._

object Dependencies {

val akkaVersion = "2.5.22"
val slickVersion = "3.3.0"
val akkaVersion = "2.5.23"
val slickVersion = "3.3.2"
val gatlingVersion = "2.2.4"

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

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

val postgres = "org.postgresql" % "postgresql" % "42.2.5"
val postgres = "org.postgresql" % "postgresql" % "42.2.6"

val mainTestDependencies = Seq (
scalaTest, akkaSlf4j, tyrex
Expand Down

0 comments on commit 1eaa618

Please sign in to comment.