update to latest sbt and fix warnings

hrj · Jan 19, 2017 · a34e5b4 · a34e5b4
1 parent e938c43
commit a34e5b4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,6 @@
-excludedJars in assembly <<= (fullClasspath in assembly) map { cp =>
-  cp filter {
-    _.data.getName == "jfxrt.jar"
-  }
+assemblyExcludedJars in assembly := {
+  val cp = (fullClasspath in assembly).value
+  cp filter { _.data.getName == "jfxrt.jar" }
 }
 
 // proguardSettings

diff --git a/gui/build.sbt b/gui/build.sbt
@@ -4,8 +4,9 @@ libraryDependencies += scalaFX
 
 unmanagedJars in Compile += Attributed.blank(file(System.getenv("JAVA_HOME") + "/jre/lib/jfxrt.jar"))
 
-excludedJars in assembly <<= (fullClasspath in assembly) map { cp => 
-    cp filter {_.data.getName == "jfxrt.jar"}
+assemblyExcludedJars in assembly := {
+  val cp = (fullClasspath in assembly).value
+  cp filter {_.data.getName == "jfxrt.jar"}
 }
 
 fork in run := true
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.13