Drop Scala 2.10

This commit is contained in:
Dale Wijnand 2016-06-19 13:06:43 +01:00
parent 121e7f5d9e
commit 4e4aa08a1a
3 changed files with 3 additions and 8 deletions

View File

@ -1,4 +1,2 @@
language: scala
scala:
- 2.10.6
- 2.11.8
scala: 2.11.8

View File

@ -13,7 +13,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
// concurrentRestrictions in Global += Util.testExclusiveRestriction,
testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
crossScalaVersions := Seq(scala210, scala211),
crossScalaVersions := Seq(scala211),
scalacOptions ++= Seq("-Ywarn-unused", "-Ywarn-unused-import"),
previousArtifact := None, // Some(organization.value %% moduleName.value % "1.0.0"),
publishArtifact in Compile := true,
@ -66,9 +66,7 @@ lazy val utilCollection = (project in internalPath / "util-collection").
settings(
commonSettings,
Util.keywordsSettings,
name := "Util Collection",
scalacOptions --= // scalac 2.10 rejects some HK types under -Xfuture it seems..
(CrossVersion partialVersion scalaVersion.value collect { case (2, 10) => "-Xfuture" }).toList
name := "Util Collection"
)
lazy val utilApplyMacro = (project in internalPath / "util-appmacro").

View File

@ -2,7 +2,6 @@ import sbt._
import Keys._
object Dependencies {
lazy val scala210 = "2.10.6"
lazy val scala211 = "2.11.8"
lazy val scala212 = "2.12.0-M4"