From c8808c586620f3c26c7495ea3a7b2775550a4349 Mon Sep 17 00:00:00 2001 From: golem131 Date: Thu, 4 May 2017 17:19:54 +0300 Subject: [PATCH] * Updates Scala 2.11.7 -> 2.11.11 * Update sbt 0.13.13 -> 0.13.15 * Dependency updates --- .travis.yml | 4 ++-- project/Build.scala | 20 ++++++++++---------- project/build.properties | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e334f1a..4f0badd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: scala scala: - 2.10.4 - - 2.11.7 - - 2.12.1 + - 2.11.11 + - 2.12.2 jdk: - oraclejdk8 diff --git a/project/Build.scala b/project/Build.scala index b543b050..84edfd83 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -50,19 +50,19 @@ object ProjectBuild extends Build { object Configuration { val commonVersion = "0.2.22-SNAPSHOT" - val projectScalaVersion = "2.12.1" - val specs2Version = "3.8.6" + val projectScalaVersion = "2.12.2" + val specs2Version = "3.8.9" - val specs2Dependency = "org.specs2" %% "specs2-core" % specs2Version % "test" - val specs2JunitDependency = "org.specs2" %% "specs2-junit" % specs2Version % "test" - val specs2MockDependency = "org.specs2" %% "specs2-mock" % specs2Version % "test" - val logbackDependency = "ch.qos.logback" % "logback-classic" % "1.1.8" % "test" + val specs2Dependency = "org.specs2" %% "specs2-core" % specs2Version % Test + val specs2JunitDependency = "org.specs2" %% "specs2-junit" % specs2Version % Test + val specs2MockDependency = "org.specs2" %% "specs2-mock" % specs2Version % Test + val logbackDependency = "ch.qos.logback" % "logback-classic" % "1.1.11" % Test val commonDependencies = Seq( - "org.slf4j" % "slf4j-api" % "1.7.22", - "joda-time" % "joda-time" % "2.9.7", + "org.slf4j" % "slf4j-api" % "1.7.25", + "joda-time" % "joda-time" % "2.9.9", "org.joda" % "joda-convert" % "1.8.1", - "io.netty" % "netty-all" % "4.1.6.Final", + "io.netty" % "netty-all" % "4.1.10.Final", "org.javassist" % "javassist" % "3.21.0-GA", specs2Dependency, specs2JunitDependency, @@ -84,7 +84,7 @@ object Configuration { , testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "sequential"), scalacOptions in doc := Seq("-doc-external-doc:scala=http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/"), - crossScalaVersions := Seq(projectScalaVersion, "2.10.6", "2.11.8"), + crossScalaVersions := Seq(projectScalaVersion, "2.10.6", "2.11.11"), javacOptions := Seq("-source", "1.6", "-target", "1.6", "-encoding", "UTF8"), organization := "com.github.mauricio", version := commonVersion, diff --git a/project/build.properties b/project/build.properties index e0cbc71d..6be49589 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 0.13.13 \ No newline at end of file +sbt.version = 0.13.15 \ No newline at end of file