Skip to content

Commit 6e7a169

Browse files
committed
cross compile for scala 2.12.0-M4. Also remove -target:jvm-1.6 scalacOptions
1 parent 0444e90 commit 6e7a169

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

project/Common.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ object Common {
1616
// Core settings
1717
organization := "com.typesafe.scala-logging",
1818
scalaVersion := Version.scala,
19-
crossScalaVersions := List(scalaVersion.value),
19+
crossScalaVersions := Version.crossScala,
2020
scalacOptions ++= List(
2121
"-unchecked",
2222
"-deprecation",
2323
"-language:_",
24-
"-target:jvm-1.6",
2524
"-encoding", "UTF-8"
2625
),
2726
unmanagedSourceDirectories in Compile := List((scalaSource in Compile).value),

project/Dependencies.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ object Version {
44
val logback = "1.1.7"
55
val mockito = "1.9.5"
66
val scala = "2.11.8"
7+
val crossScala = List(scala, "2.12.0-M4")
78
val scalaTest = "2.2.6"
89
val slf4j = "1.7.21"
910
}

0 commit comments

Comments
 (0)