Skip to content

Commit

Permalink
Merge pull request #1969 from ennru/backport-1939
Browse files Browse the repository at this point in the history
[Backport #1939] Scala 2.12.10; Akka 2.6-M8; Akka HTTP 10.1.10
  • Loading branch information
ennru authored Oct 4, 2019
2 parents 7a212dc + 4aac69d commit 7b1da6d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
- script: sbt scalafmtSbtCheck || { echo "[error] Unformatted sbt code found. Please run 'scalafmtSbt' and commit the reformatted code."; false; }
name: "Build code style check (fixed with `sbt scalafmtSbt`)"
- env: CMD="++2.11.12 Test/compile"
name: "Compile all tests (with Scala 2.11)"
name: "Compile all code with Scala 2.11"
if: type != cron
- env: CMD="++2.13.0 Test/compile"
name: "Compile all tests (with Scala 2.13)"
name: "Compile all code with Scala 2.13"
- env: CMD="unidoc"
name: "Create all API docs"
- env: CMD="docs/paradox"
Expand Down Expand Up @@ -142,8 +142,8 @@ jobs:
- stage: publish
env: CMD="++2.11.12 publish"
name: "Publish artifacts for Scala 2.11.12"
- env: CMD="++2.12.7 publish"
name: "Publish artifacts for Scala 2.12.7"
- env: CMD="++2.12.10 publish"
name: "Publish artifacts for Scala 2.12.10"
- env: CMD="++2.13.0 publish"
name: "Publish artifacts for Scala 2.13.0"
- script: openssl aes-256-cbc -K $encrypted_bbf1dc4f2a07_key -iv $encrypted_bbf1dc4f2a07_iv -in .travis/travis_alpakka_rsa.enc -out .travis/id_rsa -d && eval "$(ssh-agent -s)" && chmod 600 .travis/id_rsa && ssh-add .travis/id_rsa && sbt -jvm-opts .jvmopts-travis docs/publishRsync
Expand Down
12 changes: 6 additions & 6 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ object Dependencies {
val Nightly = sys.env.get("TRAVIS_EVENT_TYPE").contains("cron")

val Scala211 = "2.11.12"
val Scala212 = "2.12.7"
val Scala212 = "2.12.10"
val Scala213 = "2.13.0"
val ScalaVersions = Seq(Scala212, Scala211, Scala213).filterNot(_ == Scala211 && Nightly)

val AkkaVersion = if (Nightly) "2.6.0-M5" else "2.5.23"
val AkkaVersion = if (Nightly) "2.6.0-M8" else "2.5.23"

val InfluxDBJavaVersion = "2.15"

val AwsSdkVersion = "1.11.476"
val AwsSdk2Version = "2.5.65"
val AwsSpiAkkaHttpVersion = "0.0.7"
val AkkaHttpVersion = "10.1.8"
val AkkaHttpVersion = "10.1.10"
val mockitoVersion = "3.0.0"

val CouchbaseVersion = "2.7.2"
Expand All @@ -36,10 +36,10 @@ object Dependencies {
// This is only compile time dependency, therefore it does not affect the generated bytecode
// https://github.com/ghik/silencer
val Silencer = {
val Version = "1.4.2"
val Version = "1.4.3"
Seq(
compilerPlugin("com.github.ghik" %% "silencer-plugin" % Version),
"com.github.ghik" %% "silencer-lib" % Version % Provided
compilerPlugin("com.github.ghik" % "silencer-plugin" % Version cross CrossVersion.full),
"com.github.ghik" % "silencer-lib" % Version % Provided cross CrossVersion.full
)
}

Expand Down

0 comments on commit 7b1da6d

Please sign in to comment.