Merge pull request #73 from xuwei-k/latest-sbt

update sbt 0.13.15. fix warnings
spray · Jun 5, 2017 · fab4220 · fab4220
2 parents bca82e7 + 437c946
commit fab4220
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.15
diff --git a/src/main/scala/spray/revolver/Actions.scala b/src/main/scala/spray/revolver/Actions.scala
@@ -111,7 +111,7 @@ object Actions {
   import complete.Parsers._
   import complete.Parser._
   val spaceDelimitedWithoutDashes =
-          (token(Space) ~> (token(NotSpace, "<args>") - "---")).* <~ SpaceClass.*
+          (token(Space) ~> and(token(NotSpace, "<args>"), not("---", "Excluded."))).* <~ SpaceClass.*
   /*
    * A parser which parses additional options to the start task of the form
    * <arg1> <arg2> ... <argN> --- <jvmArg1> <jvmArg2> ... <jvmArgN>

diff --git a/src/main/scala/spray/revolver/RevolverPlugin.scala b/src/main/scala/spray/revolver/RevolverPlugin.scala
@@ -40,21 +40,28 @@ object RevolverPlugin extends AutoPlugin {
 
     lazy val settings = Seq(
 
-      mainClass in reStart <<= mainClass in run in Compile,
+      mainClass in reStart := (mainClass in run in Compile).value,
 
-      fullClasspath in reStart <<= fullClasspath in Runtime,
+      fullClasspath in reStart := (fullClasspath in Runtime).value,
 
       reColors in Global in reStart := Revolver.basicColors,
 
-      reStart <<= InputTask(startArgsParser) { args =>
-        (streams, reLogTag, thisProjectRef, reForkOptions, mainClass in reStart, fullClasspath in reStart, reStartArgs, args)
-          .map(restartApp)
-          .dependsOn(products in Compile)
-      },
+      reStart := Def.inputTask{
+        restartApp(
+          streams.value,
+          reLogTag.value,
+          thisProjectRef.value,
+          reForkOptions.value,
+          (mainClass in reStart).value,
+          (fullClasspath in reStart).value,
+          reStartArgs.value,
+          startArgsParser.parsed
+        )
+      }.dependsOn(products in Compile).evaluated,
 
-      reStop <<= (streams, thisProjectRef).map(stopAppWithStreams),
+      reStop := stopAppWithStreams(streams.value, thisProjectRef.value),
 
-      reStatus <<= (streams, thisProjectRef) map showStatus,
+      reStatus := showStatus(streams.value, thisProjectRef.value),
 
       // default: no arguments to the app
       reStartArgs in Global := Seq.empty,
@@ -64,7 +71,7 @@ object RevolverPlugin extends AutoPlugin {
 
       debugSettings in Global := None,
 
-      reLogTagUnscoped <<= thisProjectRef(_.project),
+      reLogTagUnscoped := thisProjectRef.value.project,
 
       // bake JRebel activation into java options for the forked JVM
       changeJavaOptionsWithExtra(debugSettings in reStart) { (jvmOptions, jrJar, debug) =>
@@ -73,28 +80,28 @@ object RevolverPlugin extends AutoPlugin {
       },
 
       // bundles the various parameters for forking
-      reForkOptions <<= (taskTemporaryDirectory, baseDirectory in reStart, javaOptions in reStart, outputStrategy,
-        javaHome) map ( (tmp, base, jvmOptions, strategy, javaHomeDir) =>
+      reForkOptions := {
+        taskTemporaryDirectory.value
         ForkOptions(
-          javaHomeDir,
-          strategy,
+          javaHome.value,
+          outputStrategy.value,
           Nil, // bootJars is empty by default because only jars on the user's classpath should be on the boot classpath
-          workingDirectory = Some(base),
-          runJVMOptions = jvmOptions,
+          workingDirectory = Some((baseDirectory in reStart).value),
+          runJVMOptions = (javaOptions in reStart).value,
           connectInput = false
         )
-      ),
+      },
 
       // stop a possibly running application if the project is reloaded and the state is reset
       onUnload in Global ~= { onUnload => state =>
         stopApps(colorLogger(state))
         onUnload(state)
       },
 
-      onLoad in Global <<= (onLoad in Global, reColors in reStart) { (onLoad, colors) => state =>
-        val colorTags = colors.map(_.toUpperCase formatted "[%s]")
+      onLoad in Global := { state =>
+        val colorTags = (reColors in reStart).value.map(_.toUpperCase formatted "[%s]")
         GlobalState.update(_.copy(colorPool = collection.immutable.Queue(colorTags: _*)))
-        onLoad(state)
+        (onLoad in Global).value.apply(state)
       }
     )
 
@@ -110,5 +117,5 @@ object RevolverPlugin extends AutoPlugin {
     changeJavaOptionsWithExtra(sbt.Keys.baseDirectory /* just an ignored dummy */)((jvmArgs, path, _) => f(jvmArgs, path))
 
   def changeJavaOptionsWithExtra[T](extra: SettingKey[T])(f: (Seq[String], String, T) => Seq[String]): Setting[_] =
-    javaOptions in reStart <<= (javaOptions, reJRebelJar, extra) map f
+    javaOptions in reStart := f(javaOptions.value, reJRebelJar.value, extra.value)
 }