diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2018-09-17 12:02:10 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2018-09-17 12:02:10 +0200 |
commit | 3af459577753485e74e3ae93b2cd02bb19c6910f (patch) | |
tree | 941dff5652480db3018433dcd22b564d58b08107 | |
parent | 92876faf942e65eeece30fd9ab89f70759b79dab (diff) | |
download | Kamon-3af459577753485e74e3ae93b2cd02bb19c6910f.tar.gz Kamon-3af459577753485e74e3ae93b2cd02bb19c6910f.tar.bz2 Kamon-3af459577753485e74e3ae93b2cd02bb19c6910f.zip |
upgrade to Scala 2.12.6
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | build.sbt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 5f85bcd0..a564bb7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: scala script: - sbt +test scala: - - 2.12.4 + - 2.12.6 jdk: - oraclejdk8 before_script: @@ -20,10 +20,10 @@ lazy val kamon = (project in file(".")) .aggregate(core, testkit, coreTests) val commonSettings = Seq( - scalaVersion := "2.12.4", + scalaVersion := "2.12.6", javacOptions += "-XDignore.symbol.file", resolvers += Resolver.mavenLocal, - crossScalaVersions := Seq("2.12.4", "2.11.8", "2.10.6"), + crossScalaVersions := Seq("2.12.6", "2.11.8", "2.10.6"), concurrentRestrictions in Global += Tags.limit(Tags.Test, 1), scalacOptions ++= Seq( "-deprecation", |