From b92b2c71096c5c06420eb1fb4136464b52ee5153 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 1 Oct 2015 02:45:38 -0400 Subject: [PATCH] Mechanically add import Import._ --- sbt/src/sbt-test/actions/aggregate/project/TestProject.scala | 1 + sbt/src/sbt-test/actions/join/project/Build.scala | 3 ++- sbt/src/sbt-test/actions/reload/changes/Changed.scala | 1 + sbt/src/sbt-test/actions/reload/external/project/Ext.scala | 1 + sbt/src/sbt-test/actions/reload/project/TestProject.scala | 1 + sbt/src/sbt-test/actions/run-task/project/B.scala | 1 + .../cache-resolver/changes/def/Build.scala | 1 + .../dependency-management/delegate/project/Build.scala | 1 + .../exclude-scala/project/ExcludeScala.scala | 1 + .../dependency-management/invalidate-internal/project/P.scala | 1 + .../dependency-management/ivy-settings-multi-a/project/P.scala | 1 + .../ivy-settings-multi-b/project/Build.scala | 1 + .../dependency-management/make-pom-type/project/Build.scala | 1 + .../dependency-management/parent-publish/project/Parent.scala | 1 + .../dependency-management/pom-packaging/project/PomTest.scala | 1 + .../dependency-management/pom-scope/project/PomTest.scala | 1 + .../dependency-management/provided-multi/changes/P.scala | 2 ++ sbt/src/sbt-test/project/auto-settings/project/P.scala | 1 + sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala | 1 + sbt/src/sbt-test/project/build-deps/project/B.scala | 1 + sbt/src/sbt-test/project/build-loaders/project/build.scala | 1 + sbt/src/sbt-test/project/circular/project/P.scala | 1 + sbt/src/sbt-test/project/console/project/Build.scala | 1 + sbt/src/sbt-test/project/extra/project/B.scala | 1 + .../isolated-build-definitions/generator/project/Build.scala | 1 + .../project/isolated-build-definitions/project/Build.scala | 1 + sbt/src/sbt-test/project/multi/changes/Build1.scala | 1 + sbt/src/sbt-test/project/multi/changes/Build2.scala | 1 + sbt/src/sbt-test/project/root-project/changes/RootA.scala | 1 + sbt/src/sbt-test/project/root-project/changes/RootD.scala | 1 + sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala | 1 + .../project/sbt-file-projects/changes/Restricted.scala | 1 + sbt/src/sbt-test/project/scala-loader/project/Build.scala | 1 + sbt/src/sbt-test/project/session-save/project/Build.scala | 1 + .../project/session-update-from-cmd/project/build.scala | 1 + sbt/src/sbt-test/project/settings/changes/Build.scala | 1 + .../project/source-plugins/project/project/Build.scala | 2 ++ sbt/src/sbt-test/project/src-plugins/project/project/P.scala | 1 + .../source-dependencies/export-jars/project/Build.scala | 1 + .../source-dependencies/inherited-macros/project/build.scala | 1 + .../source-dependencies/macro-arg-dep-2-11/project/build.scala | 1 + .../macro-arg-dep-nested-2-11/project/build.scala | 1 + .../macro-arg-dep-nested/project/build.scala | 1 + .../macro-arg-dep-stackoverflow/project/build.scala | 1 + .../source-dependencies/macro-arg-dep/project/build.scala | 1 + sbt/src/sbt-test/source-dependencies/macro/project/build.scala | 1 + .../tests/fork-parallel/project/ForkParallelTest.scala | 1 + sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala | 1 + sbt/src/sbt-test/tests/it/project/B.scala | 1 + .../tests/junit-xml-report/project/JUnitXmlReportTest.scala | 1 + sbt/src/sbt-test/tests/serial/project/Build.scala | 1 + sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala | 1 + sbt/src/sbt-test/tests/test-exclude/project/Build.scala | 1 + sbt/src/sbt-test/tests/test-quick/project/Build.scala | 1 + 54 files changed, 57 insertions(+), 1 deletion(-) diff --git a/sbt/src/sbt-test/actions/aggregate/project/TestProject.scala b/sbt/src/sbt-test/actions/aggregate/project/TestProject.scala index 34d9b9187..fd7076bb3 100644 --- a/sbt/src/sbt-test/actions/aggregate/project/TestProject.scala +++ b/sbt/src/sbt-test/actions/aggregate/project/TestProject.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ object SingleBuild extends Build with Marker { diff --git a/sbt/src/sbt-test/actions/join/project/Build.scala b/sbt/src/sbt-test/actions/join/project/Build.scala index 28835f3b3..438c3ea09 100644 --- a/sbt/src/sbt-test/actions/join/project/Build.scala +++ b/sbt/src/sbt-test/actions/join/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object Build extends Build { @@ -8,4 +9,4 @@ object Build extends Build ) lazy val b = Project("b", file("b")) lazy val c = Project("c", file("c")) -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/actions/reload/changes/Changed.scala b/sbt/src/sbt-test/actions/reload/changes/Changed.scala index 4187168aa..e3bdec504 100755 --- a/sbt/src/sbt-test/actions/reload/changes/Changed.scala +++ b/sbt/src/sbt-test/actions/reload/changes/Changed.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ object TestBuild extends Build { diff --git a/sbt/src/sbt-test/actions/reload/external/project/Ext.scala b/sbt/src/sbt-test/actions/reload/external/project/Ext.scala index ae9986dfc..b8a512f7e 100755 --- a/sbt/src/sbt-test/actions/reload/external/project/Ext.scala +++ b/sbt/src/sbt-test/actions/reload/external/project/Ext.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ object Ext extends Build { diff --git a/sbt/src/sbt-test/actions/reload/project/TestProject.scala b/sbt/src/sbt-test/actions/reload/project/TestProject.scala index c79b1c327..ccfe73cae 100755 --- a/sbt/src/sbt-test/actions/reload/project/TestProject.scala +++ b/sbt/src/sbt-test/actions/reload/project/TestProject.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ object TestBuild extends Build { diff --git a/sbt/src/sbt-test/actions/run-task/project/B.scala b/sbt/src/sbt-test/actions/run-task/project/B.scala index d1cbf6afc..5e42051ee 100644 --- a/sbt/src/sbt-test/actions/run-task/project/B.scala +++ b/sbt/src/sbt-test/actions/run-task/project/B.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/dependency-management/cache-resolver/changes/def/Build.scala b/sbt/src/sbt-test/dependency-management/cache-resolver/changes/def/Build.scala index 6ac5b8a06..83ecc5b04 100644 --- a/sbt/src/sbt-test/dependency-management/cache-resolver/changes/def/Build.scala +++ b/sbt/src/sbt-test/dependency-management/cache-resolver/changes/def/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/dependency-management/delegate/project/Build.scala b/sbt/src/sbt-test/dependency-management/delegate/project/Build.scala index dca5986fc..0e9e3ad78 100644 --- a/sbt/src/sbt-test/dependency-management/delegate/project/Build.scala +++ b/sbt/src/sbt-test/dependency-management/delegate/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/dependency-management/exclude-scala/project/ExcludeScala.scala b/sbt/src/sbt-test/dependency-management/exclude-scala/project/ExcludeScala.scala index 25eaec81d..1227a8af0 100644 --- a/sbt/src/sbt-test/dependency-management/exclude-scala/project/ExcludeScala.scala +++ b/sbt/src/sbt-test/dependency-management/exclude-scala/project/ExcludeScala.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ + import Import._ object ExcludeScala extends Build { diff --git a/sbt/src/sbt-test/dependency-management/invalidate-internal/project/P.scala b/sbt/src/sbt-test/dependency-management/invalidate-internal/project/P.scala index aacfc450b..b427fc2ba 100644 --- a/sbt/src/sbt-test/dependency-management/invalidate-internal/project/P.scala +++ b/sbt/src/sbt-test/dependency-management/invalidate-internal/project/P.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object P extends Build { diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala index eafbc6c90..c4dfc7bec 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/project/P.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-b/project/Build.scala b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-b/project/Build.scala index a08ff557b..b9a293f6d 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-b/project/Build.scala +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-b/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object Build extends Build { diff --git a/sbt/src/sbt-test/dependency-management/make-pom-type/project/Build.scala b/sbt/src/sbt-test/dependency-management/make-pom-type/project/Build.scala index aacf83ddd..3cc1aa174 100644 --- a/sbt/src/sbt-test/dependency-management/make-pom-type/project/Build.scala +++ b/sbt/src/sbt-test/dependency-management/make-pom-type/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { override def settings = super.settings ++ Seq( diff --git a/sbt/src/sbt-test/dependency-management/parent-publish/project/Parent.scala b/sbt/src/sbt-test/dependency-management/parent-publish/project/Parent.scala index 9dd7af242..cde8b19e8 100644 --- a/sbt/src/sbt-test/dependency-management/parent-publish/project/Parent.scala +++ b/sbt/src/sbt-test/dependency-management/parent-publish/project/Parent.scala @@ -1,4 +1,5 @@ import sbt._ + import Import._ object ParentTest extends Build { diff --git a/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala b/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala index 34ec5b1c8..5eeb2e202 100644 --- a/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala +++ b/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object PomTest extends Build { diff --git a/sbt/src/sbt-test/dependency-management/pom-scope/project/PomTest.scala b/sbt/src/sbt-test/dependency-management/pom-scope/project/PomTest.scala index d48742ded..6f9b5b7f6 100644 --- a/sbt/src/sbt-test/dependency-management/pom-scope/project/PomTest.scala +++ b/sbt/src/sbt-test/dependency-management/pom-scope/project/PomTest.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object PomTest extends Build { diff --git a/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala b/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala index 8fe88f86d..1c3a6530b 100644 --- a/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala +++ b/sbt/src/sbt-test/dependency-management/provided-multi/changes/P.scala @@ -1,5 +1,7 @@ import sbt._ import Keys._ +import Import._ + object P extends Build { override def settings = super.settings ++ Seq( diff --git a/sbt/src/sbt-test/project/auto-settings/project/P.scala b/sbt/src/sbt-test/project/auto-settings/project/P.scala index 3f1433d6d..7eff57a14 100644 --- a/sbt/src/sbt-test/project/auto-settings/project/P.scala +++ b/sbt/src/sbt-test/project/auto-settings/project/P.scala @@ -2,6 +2,7 @@ import Keys._ import AddSettings._ + import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala b/sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala index 9675ce201..49783505c 100644 --- a/sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala +++ b/sbt/src/sbt-test/project/binary-plugin/changes/define/A.scala @@ -2,6 +2,7 @@ package sbttest // you need package http://stackoverflow.com/questions/9822008/ import sbt._ import Keys._ +import Import._ object C extends AutoPlugin { object autoImport { diff --git a/sbt/src/sbt-test/project/build-deps/project/B.scala b/sbt/src/sbt-test/project/build-deps/project/B.scala index ec215d685..720fa8b7b 100644 --- a/sbt/src/sbt-test/project/build-deps/project/B.scala +++ b/sbt/src/sbt-test/project/build-deps/project/B.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/project/build-loaders/project/build.scala b/sbt/src/sbt-test/project/build-loaders/project/build.scala index 6110bafef..625235a91 100644 --- a/sbt/src/sbt-test/project/build-loaders/project/build.scala +++ b/sbt/src/sbt-test/project/build-loaders/project/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object EmptyLoaderBuild extends Build { override def buildLoaders = BuildLoader.transform(_.unit) :: Nil diff --git a/sbt/src/sbt-test/project/circular/project/P.scala b/sbt/src/sbt-test/project/circular/project/P.scala index fb653b9ca..9a25d0fd8 100644 --- a/sbt/src/sbt-test/project/circular/project/P.scala +++ b/sbt/src/sbt-test/project/circular/project/P.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object Build extends Build { diff --git a/sbt/src/sbt-test/project/console/project/Build.scala b/sbt/src/sbt-test/project/console/project/Build.scala index 81b28c05d..844ab45b1 100644 --- a/sbt/src/sbt-test/project/console/project/Build.scala +++ b/sbt/src/sbt-test/project/console/project/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/project/extra/project/B.scala b/sbt/src/sbt-test/project/extra/project/B.scala index 721f3d26b..7cbf9495d 100644 --- a/sbt/src/sbt-test/project/extra/project/B.scala +++ b/sbt/src/sbt-test/project/extra/project/B.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/project/isolated-build-definitions/generator/project/Build.scala b/sbt/src/sbt-test/project/isolated-build-definitions/generator/project/Build.scala index 4a292aff1..9b47bb2a7 100644 --- a/sbt/src/sbt-test/project/isolated-build-definitions/generator/project/Build.scala +++ b/sbt/src/sbt-test/project/isolated-build-definitions/generator/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { lazy val project = Project(id = "project", diff --git a/sbt/src/sbt-test/project/isolated-build-definitions/project/Build.scala b/sbt/src/sbt-test/project/isolated-build-definitions/project/Build.scala index cb69381c6..27856af2a 100644 --- a/sbt/src/sbt-test/project/isolated-build-definitions/project/Build.scala +++ b/sbt/src/sbt-test/project/isolated-build-definitions/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/project/multi/changes/Build1.scala b/sbt/src/sbt-test/project/multi/changes/Build1.scala index 1de02bfcc..d2aa4b9b2 100644 --- a/sbt/src/sbt-test/project/multi/changes/Build1.scala +++ b/sbt/src/sbt-test/project/multi/changes/Build1.scala @@ -1,6 +1,7 @@ import sbt._ import Keys.name import AddSettings._ +import Import._ object TestBuild extends Build { diff --git a/sbt/src/sbt-test/project/multi/changes/Build2.scala b/sbt/src/sbt-test/project/multi/changes/Build2.scala index 27c2314b5..aa21b29e6 100644 --- a/sbt/src/sbt-test/project/multi/changes/Build2.scala +++ b/sbt/src/sbt-test/project/multi/changes/Build2.scala @@ -1,5 +1,6 @@ import sbt._ import Keys.name +import Import._ object TestBuild extends MakeBuild { diff --git a/sbt/src/sbt-test/project/root-project/changes/RootA.scala b/sbt/src/sbt-test/project/root-project/changes/RootA.scala index 1fee35352..3d70a5c07 100644 --- a/sbt/src/sbt-test/project/root-project/changes/RootA.scala +++ b/sbt/src/sbt-test/project/root-project/changes/RootA.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/project/root-project/changes/RootD.scala b/sbt/src/sbt-test/project/root-project/changes/RootD.scala index 97b2d60a7..dd6f7e80e 100644 --- a/sbt/src/sbt-test/project/root-project/changes/RootD.scala +++ b/sbt/src/sbt-test/project/root-project/changes/RootD.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala b/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala index 379e8b7eb..4b8ae9c25 100644 --- a/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala +++ b/sbt/src/sbt-test/project/sbt-file-projects/changes/Basic.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { lazy val root = Project("root", file(".")) diff --git a/sbt/src/sbt-test/project/sbt-file-projects/changes/Restricted.scala b/sbt/src/sbt-test/project/sbt-file-projects/changes/Restricted.scala index 12f45d9ec..02e9609b9 100644 --- a/sbt/src/sbt-test/project/sbt-file-projects/changes/Restricted.scala +++ b/sbt/src/sbt-test/project/sbt-file-projects/changes/Restricted.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { lazy val root = Project("root", file(".")).settingSets( diff --git a/sbt/src/sbt-test/project/scala-loader/project/Build.scala b/sbt/src/sbt-test/project/scala-loader/project/Build.scala index 0a14c061a..43fc3e9e6 100644 --- a/sbt/src/sbt-test/project/scala-loader/project/Build.scala +++ b/sbt/src/sbt-test/project/scala-loader/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object Build extends Build { diff --git a/sbt/src/sbt-test/project/session-save/project/Build.scala b/sbt/src/sbt-test/project/session-save/project/Build.scala index 2454b14e8..eea0db9bf 100755 --- a/sbt/src/sbt-test/project/session-save/project/Build.scala +++ b/sbt/src/sbt-test/project/session-save/project/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ object TestBuild extends Build { val k1 = TaskKey[Unit]("k1") 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/build.scala index 06c554f22..76275dc8d 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/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { lazy val k1 = taskKey[Unit]("") diff --git a/sbt/src/sbt-test/project/settings/changes/Build.scala b/sbt/src/sbt-test/project/settings/changes/Build.scala index fc1af2bb4..1bb2e32f8 100644 --- a/sbt/src/sbt-test/project/settings/changes/Build.scala +++ b/sbt/src/sbt-test/project/settings/changes/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/project/source-plugins/project/project/Build.scala b/sbt/src/sbt-test/project/source-plugins/project/project/Build.scala index 6f0f4cc50..212c8e8ac 100644 --- a/sbt/src/sbt-test/project/source-plugins/project/project/Build.scala +++ b/sbt/src/sbt-test/project/source-plugins/project/project/Build.scala @@ -1,4 +1,6 @@ import sbt._ +import Import._ + object PluginDef extends Build { override def projects = Seq(root) lazy val root = Project("plugins", file(".")) dependsOn(proguard, git) diff --git a/sbt/src/sbt-test/project/src-plugins/project/project/P.scala b/sbt/src/sbt-test/project/src-plugins/project/project/P.scala index 0696a6f02..1dd23930b 100644 --- a/sbt/src/sbt-test/project/src-plugins/project/project/P.scala +++ b/sbt/src/sbt-test/project/src-plugins/project/project/P.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/source-dependencies/export-jars/project/Build.scala b/sbt/src/sbt-test/source-dependencies/export-jars/project/Build.scala index 4a783acbe..cb6bb7de2 100644 --- a/sbt/src/sbt-test/source-dependencies/export-jars/project/Build.scala +++ b/sbt/src/sbt-test/source-dependencies/export-jars/project/Build.scala @@ -1,4 +1,5 @@ import sbt._ +import Import._ object Build extends Build { diff --git a/sbt/src/sbt-test/source-dependencies/inherited-macros/project/build.scala b/sbt/src/sbt-test/source-dependencies/inherited-macros/project/build.scala index 27a684ef8..59c3b10cb 100644 --- a/sbt/src/sbt-test/source-dependencies/inherited-macros/project/build.scala +++ b/sbt/src/sbt-test/source-dependencies/inherited-macros/project/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { val defaultSettings = Seq( diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/project/build.scala index f823d8295..e2411e8ba 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/project/build.scala +++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-2-11/project/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { val defaultSettings = Seq( diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested-2-11/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested-2-11/project/build.scala index f823d8295..e2411e8ba 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested-2-11/project/build.scala +++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested-2-11/project/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { val defaultSettings = Seq( diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/project/build.scala index a5382240f..ecc979eaa 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/project/build.scala +++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/project/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { val defaultSettings = Seq( diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/project/build.scala index a5382240f..ecc979eaa 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/project/build.scala +++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/project/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { val defaultSettings = Seq( diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/project/build.scala index a5382240f..ecc979eaa 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/project/build.scala +++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/project/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { val defaultSettings = Seq( diff --git a/sbt/src/sbt-test/source-dependencies/macro/project/build.scala b/sbt/src/sbt-test/source-dependencies/macro/project/build.scala index 2ffd72654..9d2da43b5 100644 --- a/sbt/src/sbt-test/source-dependencies/macro/project/build.scala +++ b/sbt/src/sbt-test/source-dependencies/macro/project/build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object build extends Build { val defaultSettings = Seq( diff --git a/sbt/src/sbt-test/tests/fork-parallel/project/ForkParallelTest.scala b/sbt/src/sbt-test/tests/fork-parallel/project/ForkParallelTest.scala index 891658ddf..770857b6e 100644 --- a/sbt/src/sbt-test/tests/fork-parallel/project/ForkParallelTest.scala +++ b/sbt/src/sbt-test/tests/fork-parallel/project/ForkParallelTest.scala @@ -2,6 +2,7 @@ import sbt._ import Keys._ import Tests._ import Defaults._ +import Import._ object ForkParallelTest extends Build { val check = taskKey[Unit]("Check that tests are executed in parallel") diff --git a/sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala b/sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala index d8624f7e9..b48595c6b 100755 --- a/sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala +++ b/sbt/src/sbt-test/tests/fork/project/ForkTestsTest.scala @@ -2,6 +2,7 @@ import sbt._ import Keys._ import Tests._ import Defaults._ +import Import._ object ForkTestsTest extends Build { val groupSize = 3 diff --git a/sbt/src/sbt-test/tests/it/project/B.scala b/sbt/src/sbt-test/tests/it/project/B.scala index 5d98a1e89..780cee9e5 100644 --- a/sbt/src/sbt-test/tests/it/project/B.scala +++ b/sbt/src/sbt-test/tests/it/project/B.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ + import Import._ object B extends Build { diff --git a/sbt/src/sbt-test/tests/junit-xml-report/project/JUnitXmlReportTest.scala b/sbt/src/sbt-test/tests/junit-xml-report/project/JUnitXmlReportTest.scala index 77de82620..42110dda6 100644 --- a/sbt/src/sbt-test/tests/junit-xml-report/project/JUnitXmlReportTest.scala +++ b/sbt/src/sbt-test/tests/junit-xml-report/project/JUnitXmlReportTest.scala @@ -3,6 +3,7 @@ import Keys._ import scala.xml.XML import Tests._ import Defaults._ +import Import._ object JUnitXmlReportTest extends Build { val checkReport = taskKey[Unit]("Check the test reports") diff --git a/sbt/src/sbt-test/tests/serial/project/Build.scala b/sbt/src/sbt-test/tests/serial/project/Build.scala index fd4fb1c21..2375b6e09 100644 --- a/sbt/src/sbt-test/tests/serial/project/Build.scala +++ b/sbt/src/sbt-test/tests/serial/project/Build.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ object SomeBuild extends Build { val buildSettings = Seq( diff --git a/sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala b/sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala index c477d05a6..91f2dc14d 100755 --- a/sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala +++ b/sbt/src/sbt-test/tests/t543/project/Ticket543Test.scala @@ -3,6 +3,7 @@ import Keys._ import Tests._ import Defaults._ import java.io.{ CharArrayWriter, PrintWriter } +import Import._ object Ticket543Test extends Build { val marker = new File("marker") diff --git a/sbt/src/sbt-test/tests/test-exclude/project/Build.scala b/sbt/src/sbt-test/tests/test-exclude/project/Build.scala index 7f2f30f93..8bf190e36 100644 --- a/sbt/src/sbt-test/tests/test-exclude/project/Build.scala +++ b/sbt/src/sbt-test/tests/test-exclude/project/Build.scala @@ -1,6 +1,7 @@ import sbt._ import Keys._ import Defaults._ +import Import._ object B extends Build { lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq( diff --git a/sbt/src/sbt-test/tests/test-quick/project/Build.scala b/sbt/src/sbt-test/tests/test-quick/project/Build.scala index 7f2f30f93..8bf190e36 100755 --- a/sbt/src/sbt-test/tests/test-quick/project/Build.scala +++ b/sbt/src/sbt-test/tests/test-quick/project/Build.scala @@ -1,6 +1,7 @@ import sbt._ import Keys._ import Defaults._ +import Import._ object B extends Build { lazy val root = Project("root", file("."), settings = defaultSettings ++ Seq(