aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--build.sbt4
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:
diff --git a/build.sbt b/build.sbt
index 5085c086..b6064c7e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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",