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

Merge pull request #277 from eed3si9n/wip/bump 

Bump IO and Util
This commit is contained in:
eugene yokota 2018-10-29 15:16:39 -04:00 committed by GitHub
parent 4b179e526d 08b8491c7f
commit 92f8b75557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sbt
View File

@ -17,7 +17,7 @@ def commonSettings: Seq[Setting[_]] = Def.settings(
// concurrentRestrictions in Global += Util.testExclusiveRestriction,
testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
javacOptions in compile ++= Seq("-Xlint", "-Xlint:-serial"),
crossScalaVersions := Seq(scala211, scala212),
crossScalaVersions := Seq(scala212),
resolvers += Resolver.sonatypeRepo("public"),
scalacOptions := {
val old = scalacOptions.value
@ -265,7 +265,6 @@ lazy val lmCoursier = (project in file("coursier"))
.dependsOn(lmIvy)
.settings(
commonSettings,
crossScalaVersions := Seq(scala212, scala211),
name := "librarymanagement-coursier",
libraryDependencies ++= Seq(coursier,
coursierCache,

6
project/Dependencies.scala
View File

@ -3,12 +3,10 @@ import Keys._
import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
val scala211 = "2.11.12"
val scala212 = "2.12.7"
private val ioVersion = "1.2.1"
private val utilVersion = "1.2.2"
private val ioVersion = "1.3.0-M4"
private val utilVersion = "1.3.0-M2"
private val coursierVersion = "1.1.0-M7"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.2.3
sbt.version=1.2.6