luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop Scala 2.10, add openjdk7

This commit is contained in:
Dale Wijnand 2016-06-21 17:51:16 +01:00
parent 931b7d7af5
commit 9706577c67
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -1,7 +1,7 @@
language: scala language: scala
scala: scala:
- 2.10.6 - 2.11.8
- 2.11.7
jdk: jdk:
- oraclejdk8 - openjdk7
- oraclejdk7 - oraclejdk7
- oraclejdk8

2
build.sbt
View File

@ -14,7 +14,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"), testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"), javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
incOptions := incOptions.value.withNameHashing(true), incOptions := incOptions.value.withNameHashing(true),
crossScalaVersions := Seq(scala210, scala211), crossScalaVersions := Seq(scala211),
resolvers += Resolver.sonatypeRepo("public"), resolvers += Resolver.sonatypeRepo("public"),
scalacOptions += "-Ywarn-unused", scalacOptions += "-Ywarn-unused",
scalacOptions += "-Ywarn-unused-import", scalacOptions += "-Ywarn-unused-import",

1
project/Dependencies.scala
View File

@ -2,7 +2,6 @@ import sbt._
import Keys._ import Keys._
object Dependencies { object Dependencies {
lazy val scala210 = "2.10.6"
lazy val scala211 = "2.11.8" lazy val scala211 = "2.11.8"
val ioVersion = "1.0.0-M6" val ioVersion = "1.0.0-M6"