Skip to content
This repository was archived by the owner on Dec 3, 2019. It is now read-only.

Update Scala and dependency #220

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: scala
scala:
- 2.10.4
- 2.11.7
- 2.12.1
- 2.11.11
- 2.12.2

jdk:
- oraclejdk8
Expand Down
20 changes: 10 additions & 10 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 0.13.13
sbt.version = 0.13.15