diff --git a/sbt/src/sbt-test/actions/aggregate/project/TestProject.scala b/sbt/src/sbt-test/actions/aggregate/project/TestProject.scala index 74cb275a5..34d9b9187 100644 --- a/sbt/src/sbt-test/actions/aggregate/project/TestProject.scala +++ b/sbt/src/sbt-test/actions/aggregate/project/TestProject.scala @@ -2,7 +2,7 @@ import sbt._ object SingleBuild extends Build with Marker { - lazy val projects = if(file("multi").exists) Seq(root, sub, sub2) else Seq(root) + override def projects = if(file("multi").exists) Seq(root, sub, sub2) else Seq(root) lazy val root = Project("root", file("."), aggregate = if(file("aggregate").exists) Seq(sub) else Nil ) lazy val sub = Project("sub", file("sub"), aggregate = Seq(sub2)) lazy val sub2 = Project("sub2", file("sub") / "sub") 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 6799b2d01..d1cbf6afc 100644 --- a/sbt/src/sbt-test/actions/run-task/project/B.scala +++ b/sbt/src/sbt-test/actions/run-task/project/B.scala @@ -3,7 +3,6 @@ import Keys._ object B extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( myRun, fork in demo := true, diff --git a/sbt/src/sbt-test/dependency-management/artifact/project/ArtifactTest.scala b/sbt/src/sbt-test/dependency-management/artifact/project/ArtifactTest.scala index 397ef934a..36f19b187 100644 --- a/sbt/src/sbt-test/dependency-management/artifact/project/ArtifactTest.scala +++ b/sbt/src/sbt-test/dependency-management/artifact/project/ArtifactTest.scala @@ -3,7 +3,6 @@ object ArtifactTest extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))), publishTo := Some(Resolver.file("Test Publish Repo", file("test-repo"))), 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 038b601b2..d82a08c74 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 @@ -3,7 +3,6 @@ object ExcludeScala extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( libraryDependencies <++= baseDirectory(dependencies), scalaVersion := "2.8.1", diff --git a/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala index f7656c8ba..c5f3887ff 100644 --- a/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala +++ b/sbt/src/sbt-test/dependency-management/exclude-transitive/project/TestProject.scala @@ -3,12 +3,11 @@ object TestProject extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))), libraryDependencies <+= baseDirectory(transitive("javax.mail" % "mail" % "1.4.1")), - TaskKey("check-transitive") <<= check(true), - TaskKey("check-intransitive") <<= check(false) + TaskKey[Unit]("check-transitive") <<= check(true), + TaskKey[Unit]("check-intransitive") <<= check(false) ) def transitive(dep: ModuleID)(base: File) = diff --git a/sbt/src/sbt-test/dependency-management/info/project/InfoTest.scala b/sbt/src/sbt-test/dependency-management/info/project/InfoTest.scala index 4583c66e8..031309bac 100644 --- a/sbt/src/sbt-test/dependency-management/info/project/InfoTest.scala +++ b/sbt/src/sbt-test/dependency-management/info/project/InfoTest.scala @@ -4,15 +4,14 @@ object InfoTest extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))), ivyXML <<= (customInfo, organization, moduleID, version) apply inlineXML, projectID ~= (_ cross false), customInfo <<= baseDirectory{_ / "info" exists }, - TaskKey("check-download") <<= checkDownload, + TaskKey[Unit]("check-download") <<= checkDownload, delivered <<= deliverLocal map XML.loadFile, - TaskKey("check-info") <<= checkInfo + TaskKey[Unit]("check-info") <<= checkInfo ) lazy val delivered = TaskKey[NodeSeq]("delivered") lazy val customInfo = SettingKey[Boolean]("custom-info") @@ -29,14 +28,14 @@ object InfoTest extends Build else - def checkDownload = (dependencyClasspath in Compile) map { cp => if(cp.isEmpty) error("Dependency not downloaded") } + def checkDownload = (dependencyClasspath in Compile) map { cp => if(cp.isEmpty) error("Dependency not downloaded"); () } def checkInfo = (customInfo, delivered) map { (addInfo, d) => if((d \ "info").isEmpty) error("No info tag generated") else if(addInfo) { - if( !deliveredWithCustom(d) ) error("Expected 'license' and 'description' tags in info tag, got: \n" + (d \ "info")) + if( !deliveredWithCustom(d) ) error("Expected 'license' and 'description' tags in info tag, got: \n" + (d \ "info")) else () } else - if( deliveredWithCustom(d) ) error("Expected empty 'info' tag, got: \n" + (d \ "info")) + if( deliveredWithCustom(d) ) error("Expected empty 'info' tag, got: \n" + (d \ "info")) else () } def deliveredWithCustom(d: NodeSeq) = !(d \ "info" \ "license").isEmpty && !(d \ "info" \ "description").isEmpty } \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala index d3afd28a9..1010143c6 100644 --- a/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala +++ b/sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala @@ -6,7 +6,6 @@ object TestProject extends Build override lazy val settings = super.settings :+ ( ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) ) - lazy val projects = Seq(a, b) lazy val a = Project("a", file("a")) delegateTo(b) settings( libraryDependencies += "com.camptocamp.tl.caltar" % "core" % "0.5" intransitive() ) diff --git a/sbt/src/sbt-test/dependency-management/inline-default/project/build.properties b/sbt/src/sbt-test/dependency-management/inline-default/project/build.properties deleted file mode 100644 index 7c89429d7..000000000 --- a/sbt/src/sbt-test/dependency-management/inline-default/project/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -project.name=test -project.version=1.0.0 \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala b/sbt/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala deleted file mode 100644 index ef14fd0cb..000000000 --- a/sbt/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala +++ /dev/null @@ -1,19 +0,0 @@ -import sbt._ - -class TestProject(info: ProjectInfo) extends DefaultProject(info) -{ - val httpclient = "org.apache.httpcomponents" % "httpclient" % "4.0-beta2" intransitive() - - override def useDefaultConfigurations = - if("useDefaultConfigurations".asFile.exists) true else false - - lazy val checkDefault = task { check(Configurations.Default) } - lazy val checkCompile = task { check(Configurations.Compile) } - lazy val checkClasspath = task { if(compileClasspath.get.isEmpty) Some("Dependency in default configuration not added to classpath") else None } - - private def check(config: Configuration) = - if(configurationClasspath(config).get.isEmpty) - Some("Dependency in " + config.name + " configuration not downloaded") - else - None -} \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/inline-default/test b/sbt/src/sbt-test/dependency-management/inline-default/test deleted file mode 100644 index 589a667a1..000000000 --- a/sbt/src/sbt-test/dependency-management/inline-default/test +++ /dev/null @@ -1,41 +0,0 @@ -## run test with useDefaultConfigurations=false - -# Download jars. If successful, httpclient should be downloaded to the 'default' configuration -> update - - -# The jar should exist in the 'default' configuration ... -> check-default - -# but not in the 'compile' configuration ... --> check-compile - -# It should be present on the compile classpath -> check-classpath - - -# reset test -> clean-lib - -# Indicate to the project definition that we now want useDefaultConfigurations = true -$ touch useDefaultConfigurations - -# Reload for change to take effect -> reload - - -## Rerun test with useDefaultConfigurations=true - -# Download jars. If successful, httpclient should be downloaded to the 'compile' configuration -> update - - - -# The jar should not exist in the 'default' configuration ... --> check-default - -# It should exist in the 'compile' configuration -> check-compile - -# It should be present on the compile classpath -> check-classpath diff --git a/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt index 90f7f53b2..32c57329e 100644 --- a/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt +++ b/sbt/src/sbt-test/dependency-management/inline-dependencies-a/build.sbt @@ -2,7 +2,7 @@ libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5" ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) -TaskKey("check") <<= update map { report => +TaskKey[Unit]("check") <<= update map { report => val files = report.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck", revision = "1.5") ) assert(!files.isEmpty, "ScalaCheck module not found in update report") val missing = files.filter(! _.exists) diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt index 7143178e3..d78524dc5 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt @@ -1,6 +1,6 @@ seq(externalIvySettings(), externalIvyFile()) -TaskKey("check") <<= (baseDirectory, update) map { (base, report) => +TaskKey[Unit]("check") <<= (baseDirectory, update) map { (base, report) => val files = report.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck", revision = "1.5") ) assert(!files.isEmpty, "ScalaCheck module not found in update report") } \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt index fd5bfeab5..49e490c09 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt @@ -2,7 +2,7 @@ externalIvySettings() libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5" -TaskKey("check") <<= (baseDirectory, update) map { (base, report) => +TaskKey[Unit]("check") <<= (baseDirectory, update) map { (base, report) => val files = report.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck", revision = "1.5") ) assert(!files.isEmpty, "ScalaCheck module not found in update report") } \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala b/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala index efe514124..df2fe56e4 100644 --- a/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala +++ b/sbt/src/sbt-test/dependency-management/make-pom/project/MakePomTest.scala @@ -4,11 +4,10 @@ object MakePomTest extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( readPom <<= makePom map XML.loadFile, - TaskKey("check-pom") <<= checkPom, - TaskKey("check-extra") <<= checkExtra, + TaskKey[Unit]("check-pom") <<= checkPom, + TaskKey[Unit]("check-extra") <<= checkExtra, makePomConfiguration ~= { _.copy(extra = ) } ) @@ -30,7 +29,7 @@ object MakePomTest extends Build lazy val checkExtra = readPom map { pomXML => checkProject(pomXML) val extra = pomXML \ extraTagName - if(extra.isEmpty) error("'" + extraTagName + "' not found in generated pom.xml.") + if(extra.isEmpty) error("'" + extraTagName + "' not found in generated pom.xml.") else () } lazy val checkPom = (readPom, fullResolvers) map { (pomXML, ivyRepositories) => @@ -44,6 +43,8 @@ object MakePomTest extends Build if( writtenRepositories != mavenStyleRepositories ) error("Written repositories did not match declared repositories.\n\t" + explain) + else + () } } diff --git a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml index 7afecf7af..a6de9d228 100644 --- a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml +++ b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml @@ -1,7 +1,9 @@ - + - + + + \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/SettingsTest.scala b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/SettingsTest.scala index adea9d87b..ecc30123f 100644 --- a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/SettingsTest.scala +++ b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/SettingsTest.scala @@ -3,15 +3,14 @@ object SettingsTest extends Build { - lazy val projects = Seq(parent, sub, configgy) lazy val parent: Project = Project("Parent", file(".")) aggregate(sub) settings( externalIvySettings(), ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) ) - lazy val sub: Project = Project("Sub", file("sub"), delegates = parent :: Nil) dependsOn(configgy) aggregate(configgy) settings( + lazy val sub: Project = Project("Sub", file("sub"), delegates = parent :: Nil) dependsOn(compiler) aggregate(compiler) settings( externalIvySettings() ) - lazy val configgy = Project("Configgy", file("configgy"), delegates = sub :: Nil) settings( - libraryDependencies += "net.lag" % "configgy" % "1.1" + lazy val compiler = Project("Compiler", file("compiler"), delegates = sub :: Nil) settings( + libraryDependencies <+= scalaVersion( "org.scala-lang" % "scala-compiler" % _ ) ) } \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties deleted file mode 100644 index ad36054d5..000000000 --- a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -project.version=1.0 -project.name=Settings Test \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala b/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala deleted file mode 100644 index 11fa48fcb..000000000 --- a/sbt/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala +++ /dev/null @@ -1,11 +0,0 @@ -import sbt._ - -class SettingsTest(info: ProjectInfo) extends DefaultProject(info) -{ - val child = project("sub", "Sub", new SubProject(_)) - - class SubProject(info: ProjectInfo) extends DefaultProject(info) - { - val configgy = "net.lag" % "configgy" % "1.1" - } -} \ No newline at end of file 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 3a51d5d8b..709c99154 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 @@ -2,7 +2,6 @@ object ParentTest extends Build { - lazy val projects = Seq(parent, core, reporters, jfreechart) lazy val parent: Project = Project("Flowmodel", file(".")) aggregate(core, reporters) lazy val core: Project = Project("Flowmodel core", file("core"), delegates = parent :: Nil) lazy val reporters: Project = Project("Extra reporters", file("reporters"), delegates = parent :: Nil) aggregate(jfreechart) dependsOn(jfreechart) diff --git a/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala b/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala index f2a9df6ca..9bb920406 100644 --- a/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala +++ b/sbt/src/sbt-test/dependency-management/pom-advanced/project/PomRepoTest.scala @@ -4,10 +4,9 @@ object PomRepoTest extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( resolvers ++= Seq(local, ScalaToolsSnapshots), - InputKey("check-pom") <<= InputTask(_ => spaceDelimited("")) { result => (makePom, result, streams) map checkPomRepositories }, + InputKey[Unit]("check-pom") <<= InputTask(_ => spaceDelimited("")) { result => (makePom, result, streams) map checkPomRepositories }, makePomConfiguration <<= (makePomConfiguration, baseDirectory) { (conf, base) => conf.copy(filterRepositories = pomIncludeRepository(base, conf.filterRepositories) ) }, diff --git a/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala index d45785e4d..5185f8b3f 100644 --- a/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala +++ b/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala @@ -10,7 +10,6 @@ object MultiPublishTest extends Build externalResolvers <<= baseDirectory { base => Resolver.file("local", base / "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil } } - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( name := "Retrieve Test", libraryDependencies := if("mavenStyle".asFile.exists) mavenStyleDependencies else ivyStyleDependencies diff --git a/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala index d9a61d1e0..bb5b49bf1 100644 --- a/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala +++ b/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala @@ -10,7 +10,6 @@ object MultiPublishTest extends Build externalResolvers <<= baseDirectory { base => Resolver.file("local", base / "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil } ) - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( mavenStyle, name = "Publish Test" ) lazy val sub = Project("sub", file("sub")) settings( mavenStyle, name = "Sub Project" ) diff --git a/sbt/src/sbt-test/dependency-management/sources/project/Test.scala b/sbt/src/sbt-test/dependency-management/sources/project/Test.scala index 3458b5485..2b96f5e00 100644 --- a/sbt/src/sbt-test/dependency-management/sources/project/Test.scala +++ b/sbt/src/sbt-test/dependency-management/sources/project/Test.scala @@ -3,23 +3,27 @@ import Keys._ object Test extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( libraryDependencies += "net.liftweb" % "lift-webkit" % "1.0" intransitive(), libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5" intransitive(), transitiveClassifiers := Seq("sources"), - TaskKey("check-sources") <<= updateClassifiers map checkSources, - TaskKey("check-binaries") <<= update map checkBinaries + TaskKey[Unit]("check-sources") <<= updateClassifiers map checkSources, + TaskKey[Unit]("check-binaries") <<= update map checkBinaries ) def getSources(report: UpdateReport) = report.matching(artifactFilter(`classifier` = "sources") ) - def checkSources(report: UpdateReport) = + def checkSources(report: UpdateReport): Unit = { val srcs = getSources(report) - if(srcs.isEmpty) error("No sources retrieved") else if(srcs.size != 2) error("Incorrect sources retrieved:\n\t" + srcs.mkString("\n\t")) + if(srcs.isEmpty) + error("No sources retrieved") + else if(srcs.size != 2) + error("Incorrect sources retrieved:\n\t" + srcs.mkString("\n\t")) + else + () } - def checkBinaries(report: UpdateReport) = + def checkBinaries(report: UpdateReport): Unit = { val srcs = getSources(report) - if(!srcs.isEmpty) error("Sources retrieved:\n\t" + srcs.mkString("\n\t")) + if(!srcs.isEmpty) error("Sources retrieved:\n\t" + srcs.mkString("\n\t")) else () } } \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/url/project/TestProject.scala b/sbt/src/sbt-test/dependency-management/url/project/TestProject.scala index 71015f98a..471b22b88 100644 --- a/sbt/src/sbt-test/dependency-management/url/project/TestProject.scala +++ b/sbt/src/sbt-test/dependency-management/url/project/TestProject.scala @@ -3,11 +3,10 @@ object TestProject extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( libraryDependencies += "slinky" % "slinky" % "2.1" % "test" from "http://slinky2.googlecode.com/svn/artifacts/2.1/slinky.jar", - TaskKey("check-in-test") <<= checkClasspath(Test), - TaskKey("check-in-compile") <<= checkClasspath(Compile) + TaskKey[Unit]("check-in-test") <<= checkClasspath(Test), + TaskKey[Unit]("check-in-compile") <<= checkClasspath(Compile) ) lazy val checkInTest = checkClasspath(testClasspath) @@ -18,6 +17,7 @@ object TestProject extends Build { val loader = ClasspathUtilities.toLoader(cp) Class.forName("slinky.http.Application", false, loader) + () } catch { diff --git a/sbt/src/sbt-test/java/argfile/build.sbt b/sbt/src/sbt-test/java/argfile/build.sbt index 39f4e795d..70bf4e0b6 100644 --- a/sbt/src/sbt-test/java/argfile/build.sbt +++ b/sbt/src/sbt-test/java/argfile/build.sbt @@ -2,7 +2,7 @@ scalaSource in Configurations.Compile <<= sourceDirectory( _ / " scala test " ) javaSource in Configurations.Compile <<= sourceDirectory( _ / " java test " ) -TaskKey("init") <<= (scalaSource in Configurations.Compile, javaSource in Configurations.Compile) map { (ss, js) => +TaskKey[Unit]("init") <<= (scalaSource in Configurations.Compile, javaSource in Configurations.Compile) map { (ss, js) => import IO._ createDirectories(ss :: js :: Nil) copyFile(file("changes") / "Test.scala", ss / " Test s.scala") diff --git a/sbt/src/sbt-test/java/track-anonymous/build.sbt b/sbt/src/sbt-test/java/track-anonymous/build.sbt index 6742df20a..a9fad27c1 100644 --- a/sbt/src/sbt-test/java/track-anonymous/build.sbt +++ b/sbt/src/sbt-test/java/track-anonymous/build.sbt @@ -1,11 +1,15 @@ import sbt.complete.DefaultParsers._ -InputKey("check-output") <<= { +InputKey[Unit]("check-output") <<= { val parser = token(Space ~> ( ("exists" ^^^ true) | ("absent" ^^^ false) ) ) def action(result: TaskKey[Boolean]) = (classDirectory in Configurations.Compile, result) map { (dir, shouldExist) => - if((dir / "Anon.class").exists != shouldExist) error("Top level class incorrect" ) - else if( (dir / "Anon$1.class").exists != shouldExist) error("Inner class incorrect" ) + if((dir / "Anon.class").exists != shouldExist) + error("Top level class incorrect" ) + else if( (dir / "Anon$1.class").exists != shouldExist) + error("Inner class incorrect" ) + else + () } InputTask(s => parser)(action) } \ No newline at end of file diff --git a/sbt/src/sbt-test/project/Class.forName/changes/build2.sbt b/sbt/src/sbt-test/project/Class.forName/changes/build2.sbt index 295fa0897..7750001c7 100644 --- a/sbt/src/sbt-test/project/Class.forName/changes/build2.sbt +++ b/sbt/src/sbt-test/project/Class.forName/changes/build2.sbt @@ -1,3 +1,3 @@ crossPaths :== false -TaskKey("use-jar") := { injar.Test.other; () } +TaskKey[Unit]("use-jar") := { injar.Test.other; () } diff --git a/sbt/src/sbt-test/project/console/project/Build.scala b/sbt/src/sbt-test/project/console/project/Build.scala index ef35ffbeb..81b28c05d 100644 --- a/sbt/src/sbt-test/project/console/project/Build.scala +++ b/sbt/src/sbt-test/project/console/project/Build.scala @@ -2,8 +2,6 @@ import sbt._ object B extends Build { - lazy val projects = Seq(root, sub1, sub2, sub3) - lazy val root = Project("root", file(".")) lazy val sub1 = Project("sub1", file("sub1")) lazy val sub2 = Project("sub2", file("sub2")) diff --git a/sbt/src/sbt-test/project/delegate_config/project/Build.scala b/sbt/src/sbt-test/project/delegate_config/project/Build.scala index 7a631dc23..9c6cdc35e 100644 --- a/sbt/src/sbt-test/project/delegate_config/project/Build.scala +++ b/sbt/src/sbt-test/project/delegate_config/project/Build.scala @@ -11,7 +11,6 @@ object B extends Build val sample = SettingKey[Int]("sample") val check = TaskKey[Unit]("check") - lazy val projects = Seq(root, sub) lazy val root = Project("root", file("."), settings = Nil) lazy val sub = Project("sub", file("."), delegates = root :: Nil, configurations = newConfig :: Nil, settings = incSample :: checkTask(4) :: Nil) override lazy val settings = diff --git a/sbt/src/sbt-test/project/delegates/project/Build.scala b/sbt/src/sbt-test/project/delegates/project/Build.scala index 973f818fd..5abc9563d 100644 --- a/sbt/src/sbt-test/project/delegates/project/Build.scala +++ b/sbt/src/sbt-test/project/delegates/project/Build.scala @@ -6,7 +6,6 @@ object B extends Build { val check = InputKey[Unit]("check-max-errors") - lazy val projects = Seq(root, sub) lazy val root = Project("root", file(".")) lazy val sub = Project("sub", file(".")) delegateTo(root) settings(check <<= checkTask) diff --git a/sbt/src/sbt-test/project/flatten/project/Flat.scala b/sbt/src/sbt-test/project/flatten/project/Flat.scala index 5ed835641..0d254a81d 100644 --- a/sbt/src/sbt-test/project/flatten/project/Flat.scala +++ b/sbt/src/sbt-test/project/flatten/project/Flat.scala @@ -4,7 +4,6 @@ import Configurations.{Compile, Test} object Flat extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file("."), settings = Defaults.defaultSettings ++ forConfig(Compile, "src") ++ forConfig(Test, "test-src") ++ baseSettings ) diff --git a/sbt/src/sbt-test/project/multi/changes/Build1.scala b/sbt/src/sbt-test/project/multi/changes/Build1.scala index 33b64c1dc..295386d40 100644 --- a/sbt/src/sbt-test/project/multi/changes/Build1.scala +++ b/sbt/src/sbt-test/project/multi/changes/Build1.scala @@ -3,7 +3,7 @@ import Keys.name object TestBuild extends Build { - lazy val projects = Seq( + override def projects = Seq( proj("a", "."), proj("b", "b") ) diff --git a/sbt/src/sbt-test/project/multi/changes/Build2.scala b/sbt/src/sbt-test/project/multi/changes/Build2.scala index eee1b1870..f8cb3d2e7 100644 --- a/sbt/src/sbt-test/project/multi/changes/Build2.scala +++ b/sbt/src/sbt-test/project/multi/changes/Build2.scala @@ -3,11 +3,11 @@ import Keys.name object TestBuild extends MakeBuild { - lazy val projects = Seq( proj("a", ".") ) + lazy val a = proj("a", ".") } object SecondBuild extends MakeBuild { - lazy val projects = Seq( proj("b", "b") ) + lazy val b = proj("b", "b") } trait MakeBuild extends Build { diff --git a/sbt/src/sbt-test/project/multi/changes/a.sbt b/sbt/src/sbt-test/project/multi/changes/a.sbt index 70689036f..c7c870452 100644 --- a/sbt/src/sbt-test/project/multi/changes/a.sbt +++ b/sbt/src/sbt-test/project/multi/changes/a.sbt @@ -1 +1 @@ -TaskKey("example") := () \ No newline at end of file +TaskKey[Unit]("example") := () \ No newline at end of file diff --git a/sbt/src/sbt-test/project/multi/changes/b.sbt b/sbt/src/sbt-test/project/multi/changes/b.sbt index cfbaa52af..22b24e8f7 100644 --- a/sbt/src/sbt-test/project/multi/changes/b.sbt +++ b/sbt/src/sbt-test/project/multi/changes/b.sbt @@ -1 +1 @@ -TaskKey("sample") := () \ No newline at end of file +TaskKey[Unit]("sample") := () \ No newline at end of file diff --git a/sbt/src/sbt-test/project/multi/changes/b2.sbt b/sbt/src/sbt-test/project/multi/changes/b2.sbt index 45ca260f3..acbfb0493 100644 --- a/sbt/src/sbt-test/project/multi/changes/b2.sbt +++ b/sbt/src/sbt-test/project/multi/changes/b2.sbt @@ -1 +1 @@ -TaskKey("sample2") := () \ No newline at end of file +TaskKey[Unit]("sample2") := () \ No newline at end of file diff --git a/sbt/src/sbt-test/project/plugins/build.sbt b/sbt/src/sbt-test/project/plugins/build.sbt index c95877801..f220f4d56 100644 --- a/sbt/src/sbt-test/project/plugins/build.sbt +++ b/sbt/src/sbt-test/project/plugins/build.sbt @@ -1,4 +1,4 @@ -TaskKey("check") := { +TaskKey[Unit]("check") := { import antlr.Tool // verify that antlr is on compile classpath Class.forName("antlr.Tool") // verify antlr is on runtime classpath () diff --git a/sbt/src/sbt-test/project/src-plugins/project/plugins/project/P.scala b/sbt/src/sbt-test/project/src-plugins/project/plugins/project/P.scala index 19043338a..96c335289 100644 --- a/sbt/src/sbt-test/project/src-plugins/project/plugins/project/P.scala +++ b/sbt/src/sbt-test/project/src-plugins/project/plugins/project/P.scala @@ -2,5 +2,5 @@ import sbt._ object B extends Build { - lazy val projects = Project("root", file(".")).dependsOn( file("../../plugin") ) :: Nil + lazy val root = Project("root", file(".")).dependsOn( file("../../plugin") ) } \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/compactify/build.sbt b/sbt/src/sbt-test/source-dependencies/compactify/build.sbt index 455d90137..edf728a96 100644 --- a/sbt/src/sbt-test/source-dependencies/compactify/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/compactify/build.sbt @@ -1,4 +1,4 @@ -TaskKey("output-empty") <<= classDirectory in Configurations.Compile map { outputDirectory => +TaskKey[Unit]("output-empty") <<= classDirectory in Configurations.Compile map { outputDirectory => def classes = (outputDirectory ** "*.class").get - if(!classes.isEmpty) error("Classes existed:\n\t" + classes.mkString("\n\t")) + if(!classes.isEmpty) error("Classes existed:\n\t" + classes.mkString("\n\t")) else () } diff --git a/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt index 2d8cf11f8..142bf03f6 100644 --- a/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt @@ -1,6 +1,6 @@ name :== "test" -TaskKey("check-same") <<= compile in Configurations.Compile map { analysis => +TaskKey[Unit]("check-same") <<= compile in Configurations.Compile map { analysis => analysis.apis.internal foreach { case (_, api) => assert( xsbt.api.APIUtil.verifyTypeParameters(api) ) assert( xsbt.api.SameAPI(api, api) ) diff --git a/sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala index fdf5263dd..9c2678540 100644 --- a/sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala +++ b/sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala @@ -4,16 +4,16 @@ import java.net.URLClassLoader object B extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) settings( ss : _*) def ss = Seq( - TaskKey("check-first") <<= checkTask("First"), - TaskKey("check-second") <<= checkTask("Second") + TaskKey[Unit]("check-first") <<= checkTask("First"), + TaskKey[Unit]("check-second") <<= checkTask("Second") ) private def checkTask(className: String) = fullClasspath in Configurations.Runtime map { runClasspath => val cp = runClasspath.map(_.data.toURI.toURL).toArray Class.forName(className, false, new URLClassLoader(cp)) + () } } diff --git a/sbt/src/sbt-test/tests/it/project/B.scala b/sbt/src/sbt-test/tests/it/project/B.scala index b4ced5412..e576dbe8f 100644 --- a/sbt/src/sbt-test/tests/it/project/B.scala +++ b/sbt/src/sbt-test/tests/it/project/B.scala @@ -3,7 +3,6 @@ object B extends Build { - lazy val projects = Seq(root) lazy val root = Project("root", file(".")) .configs( IntegrationTest )