From 4b17730e833546ab17b86ebf9fb356c7b80a7c88 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 28 Mar 2016 19:04:22 -0400 Subject: [PATCH] Port project/session-update-from-cmd --- .../project/session-update-from-cmd/build.check.1 | 10 +++++++++- .../project/session-update-from-cmd/build.check.2 | 10 +++++++++- .../sbt-test/project/session-update-from-cmd/build.sbt | 10 +++++++++- .../project/{build.scala => Common.scala} | 6 +----- 4 files changed, 28 insertions(+), 8 deletions(-) rename sbt/src/sbt-test/project/session-update-from-cmd/project/{build.scala => Common.scala} (90%) diff --git a/sbt/src/sbt-test/project/session-update-from-cmd/build.check.1 b/sbt/src/sbt-test/project/session-update-from-cmd/build.check.1 index 019984510..630f13723 100644 --- a/sbt/src/sbt-test/project/session-update-from-cmd/build.check.1 +++ b/sbt/src/sbt-test/project/session-update-from-cmd/build.check.1 @@ -1,3 +1,5 @@ +import Common._ + name := "projectName" k1 := { @@ -9,4 +11,10 @@ k2 := { println("This is k2") } -val x = 5; k3 := {}; k4 := {} \ No newline at end of file +val x = 5; k3 := {}; k4 := {} + + +lazy val root = (project in file(".")). + settings( + commands ++= Seq(UpdateK1, UpdateK3) + ) diff --git a/sbt/src/sbt-test/project/session-update-from-cmd/build.check.2 b/sbt/src/sbt-test/project/session-update-from-cmd/build.check.2 index f9128e0be..0103c0c76 100644 --- a/sbt/src/sbt-test/project/session-update-from-cmd/build.check.2 +++ b/sbt/src/sbt-test/project/session-update-from-cmd/build.check.2 @@ -1,3 +1,5 @@ +import Common._ + name := "projectName" k1 := { @@ -12,4 +14,10 @@ k2 := { val x = 5; k3 := { // // -}; k4 := {} \ No newline at end of file +}; k4 := {} + + +lazy val root = (project in file(".")). + settings( + commands ++= Seq(UpdateK1, UpdateK3) + ) diff --git a/sbt/src/sbt-test/project/session-update-from-cmd/build.sbt b/sbt/src/sbt-test/project/session-update-from-cmd/build.sbt index fdd333a83..9fa9bb3ed 100644 --- a/sbt/src/sbt-test/project/session-update-from-cmd/build.sbt +++ b/sbt/src/sbt-test/project/session-update-from-cmd/build.sbt @@ -1,3 +1,5 @@ +import Common._ + name := "projectName" k1 := {} @@ -6,4 +8,10 @@ k2 := { println("This is k2") } -val x = 5; k3 := {}; k4 := {} \ No newline at end of file +val x = 5; k3 := {}; k4 := {} + + +lazy val root = (project in file(".")). + settings( + commands ++= Seq(UpdateK1, UpdateK3) + ) diff --git a/sbt/src/sbt-test/project/session-update-from-cmd/project/build.scala b/sbt/src/sbt-test/project/session-update-from-cmd/project/Common.scala similarity index 90% rename from sbt/src/sbt-test/project/session-update-from-cmd/project/build.scala rename to sbt/src/sbt-test/project/session-update-from-cmd/project/Common.scala index 76275dc8d..4d9fc6660 100644 --- a/sbt/src/sbt-test/project/session-update-from-cmd/project/build.scala +++ b/sbt/src/sbt-test/project/session-update-from-cmd/project/Common.scala @@ -2,7 +2,7 @@ import sbt._ import Keys._ import Import._ -object build extends Build { +object Common { lazy val k1 = taskKey[Unit]("") lazy val k2 = taskKey[Unit]("") lazy val k3 = taskKey[Unit]("") @@ -32,10 +32,6 @@ object build extends Build { // SessionSettings.writeSettings(ex.currentRef, session2, ex.session.original, ex.structure) SessionSettings.saveAllSettings(st1) } - - lazy val root = Project("root", file(".")) settings( - commands ++= Seq(UpdateK1, UpdateK3) - ) } // vim: set ts=4 sw=4 et: