luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-08-28 17:13:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch cli to scala 2.12 and latest case-app

Browse Source
This commit is contained in:
Alexandre Archambault
2018-02-07 10:23:07 +01:00
parent bd726d9e26
commit 506e14a90b
53 changed files with 1322 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/Deps.scala
+5 -5
View File
@@ -10,9 +10,9 @@ object Deps {
def jsoup = "org.jsoup" % "jsoup" % "1.10.3"
def scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.0.6"
def scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % SharedVersions.scalaz
def caseApp = "com.github.alexarchambault" %% "case-app" % "1.1.3"
def caseApp = "com.github.alexarchambault" %% "case-app" % "2.0.0-M3"
def okhttpUrlConnection = "com.squareup.okhttp" % "okhttp-urlconnection" % "2.7.5"
def argonautShapeless = "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M6"
def argonautShapeless = "com.github.alexarchambault" %% "argonaut-shapeless_6.2" % "1.2.0-M8"
def jackson = "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.8.4"
def scalatest = "org.scalatest" %% "scalatest" % "3.0.0"
def junit = "junit" % "junit" % "4.12"
@@ -42,7 +42,7 @@ object Deps {
"org.slf4j" % "slf4j-api" % "1.7.25"
)
def scalaNativeNir = "io.get-coursier.scala-native" %% "nir" % SharedVersions.scalaNative
def scalaNativeTools = "io.get-coursier.scala-native" %% "tools" % SharedVersions.scalaNative
def scalaNativeUtil = "io.get-coursier.scala-native" %% "util" % SharedVersions.scalaNative
def scalaNativeNir = "org.scala-native" %% "nir" % SharedVersions.scalaNative
def scalaNativeTools = "org.scala-native" %% "tools" % SharedVersions.scalaNative
def scalaNativeUtil = "org.scala-native" %% "util" % SharedVersions.scalaNative
}
project/Settings.scala
+1 -1
View File
@@ -266,7 +266,7 @@ object Settings {
lazy val addProguardedJar = {
val extra = Def.taskDyn[Map[Artifact, File]] {
if (scalaBinaryVersion.value == "2.11")
if (scalaBinaryVersion.value == "2.12")
Def.task(Map(proguardedArtifact.value -> proguardedJar.value))
else
Def.task(Map())
project/SharedVersions.scala
+1 -1
View File
@@ -4,7 +4,7 @@ object SharedVersions {
def asm = "5.2"
def fastParse = "1.0.0"
def proguard = "5.3.3"
def scalaNative = "0.3.0-coursier-1"
def scalaNative = "0.3.6"
def scalaz = "7.2.16"
}