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

Merge pull request #237 from eed3si9n/wip/bump 

Scala 2.12.6 and other dependencies
This commit is contained in:
Dale Wijnand 2018-04-30 11:10:15 +01:00 committed by GitHub
parent c57a55d3e9 3b6df7d105
commit 10b6efc4c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project/Dependencies.scala
View File

@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
val scala211 = "2.11.12"
val scala212 = "2.12.4"
val scala212 = "2.12.6"
private val ioVersion = "1.1.3"
private val utilVersion = "1.1.3"
@ -45,8 +45,8 @@ object Dependencies {
val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
val scalaXml = scala211Module("scala-xml", "1.0.5")
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.1" % Test
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4" % Test
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.5" % Test
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.14.0" % Test
val sjsonnew = Def.setting {
"com.eed3si9n" %% "sjson-new-core" % contrabandSjsonNewVersion.value
}

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.1.2
sbt.version=1.1.4