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

Commit 79b8e4a

Browse files
committed
Scala 2.12.0 support
1 parent c597318 commit 79b8e4a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ scala:
55
jdk:
66
- oraclejdk7
77
- oraclejdk8
8+
9+
matrix:
10+
include:
11+
- scala: 2.12.0
12+
jdk: oraclejdk8
13+
814
services:
915
- postgresql
1016
- mysql

project/Build.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ object ProjectBuild extends Build {
77
val postgresqlName = "postgresql-async"
88
val mysqlName = "mysql-async"
99

10+
scalaVersion := "2.12.0"
1011
lazy val root = Project(
1112
id = "db-async-base",
1213
base = file("."),
@@ -51,7 +52,7 @@ object Configuration {
5152

5253
val commonVersion = "0.2.21-SNAPSHOT"
5354
val projectScalaVersion = "2.11.7"
54-
val specs2Version = "3.8.5"
55+
val specs2Version = "3.8.6"
5556

5657
val specs2Dependency = "org.specs2" %% "specs2-core" % specs2Version % "test"
5758
val specs2JunitDependency = "org.specs2" %% "specs2-junit" % specs2Version % "test"
@@ -84,7 +85,7 @@ object Configuration {
8485
,
8586
testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "sequential"),
8687
scalacOptions in doc := Seq("-doc-external-doc:scala=http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/"),
87-
crossScalaVersions := Seq(projectScalaVersion, "2.10.6"),
88+
crossScalaVersions := Seq(projectScalaVersion, "2.10.6", "2.12.0"),
8889
javacOptions := Seq("-source", "1.6", "-target", "1.6", "-encoding", "UTF8"),
8990
organization := "com.github.mauricio",
9091
version := commonVersion,

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.8
1+
sbt.version = 0.13.12

0 commit comments

Comments
 (0)