luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

annotate return type Seq[Setting[_]] for several methods in Defaults 

works around issue with scalac:
[error] class file needed by Defaults is missing.
[error] reference type _$34 of (t: <?>)(ss: <?>)Seq[sbt.Project.Setting[_]] refers to nonexisting symbol.
This commit is contained in:
Mark Harrah 2011-06-18 21:02:13 -04:00
parent a028f8e6d7
commit 4c770e8f27
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/Defaults.scala
View File

@ -222,7 +222,7 @@ object Defaults extends BuildCommon
def unmanagedResourcesTask(dirs: Seq[File], excl: FileFilter) = def unmanagedResourcesTask(dirs: Seq[File], excl: FileFilter) =
dirs.descendentsExcept("*",excl).get dirs.descendentsExcept("*",excl).get
lazy val testTasks = testTaskOptions(test) ++ testTaskOptions(testOnly) ++ Seq( lazy val testTasks: Seq[Setting[_]] = testTaskOptions(test) ++ testTaskOptions(testOnly) ++ Seq(
testLoader <<= (fullClasspath, scalaInstance) map { (cp, si) => TestFramework.createTestLoader(data(cp), si) }, testLoader <<= (fullClasspath, scalaInstance) map { (cp, si) => TestFramework.createTestLoader(data(cp), si) },
testFrameworks in GlobalScope :== { testFrameworks in GlobalScope :== {
import sbt.TestFrameworks._ import sbt.TestFrameworks._
@ -281,12 +281,12 @@ object Defaults extends BuildCommon
Tests.discover(frameworkMap.values.toSeq, analysis, s.log)._1 Tests.discover(frameworkMap.values.toSeq, analysis, s.log)._1
} }
lazy val packageBase = Seq( lazy val packageBase: Seq[Setting[_]] = Seq(
artifact <<= normalizedName(n => Artifact(n)), artifact <<= normalizedName(n => Artifact(n)),
packageOptions in GlobalScope :== Nil, packageOptions in GlobalScope :== Nil,
artifactName in GlobalScope :== ( Artifact.artifactName _ ) artifactName in GlobalScope :== ( Artifact.artifactName _ )
) )
lazy val packageConfig = Seq( lazy val packageConfig: Seq[Setting[_]] = Seq(
packageOptions in packageBin <<= (packageOptions, mainClass in packageBin) map { _ ++ _.map(Package.MainClass.apply).toList } packageOptions in packageBin <<= (packageOptions, mainClass in packageBin) map { _ ++ _.map(Package.MainClass.apply).toList }
) ++ ) ++
packageTasks(packageBin, packageBinTask) ++ packageTasks(packageBin, packageBinTask) ++
@ -497,14 +497,14 @@ object Defaults extends BuildCommon
lazy val baseTasks: Seq[Setting[_]] = projectTasks ++ packageBase lazy val baseTasks: Seq[Setting[_]] = projectTasks ++ packageBase
lazy val baseClasspaths = Classpaths.publishSettings ++ Classpaths.baseSettings lazy val baseClasspaths: Seq[Setting[_]] = Classpaths.publishSettings ++ Classpaths.baseSettings
lazy val configSettings = Classpaths.configSettings ++ configTasks ++ configPaths ++ packageConfig ++ Classpaths.compilerPluginConfig lazy val configSettings: Seq[Setting[_]] = Classpaths.configSettings ++ configTasks ++ configPaths ++ packageConfig ++ Classpaths.compilerPluginConfig
lazy val compileSettings = configSettings ++ (mainRunMainTask +: mainRunTask +: addBaseSources) lazy val compileSettings: Seq[Setting[_]] = configSettings ++ (mainRunMainTask +: mainRunTask +: addBaseSources)
lazy val testSettings = configSettings ++ testTasks lazy val testSettings: Seq[Setting[_]] = configSettings ++ testTasks
lazy val itSettings = inConfig(IntegrationTest)(testSettings) lazy val itSettings: Seq[Setting[_]] = inConfig(IntegrationTest)(testSettings)
lazy val defaultConfigs = inConfig(Compile)(compileSettings) ++ inConfig(Test)(testSettings) ++ inConfig(Runtime)(Classpaths.configSettings) lazy val defaultConfigs: Seq[Setting[_]] = inConfig(Compile)(compileSettings) ++ inConfig(Test)(testSettings) ++ inConfig(Runtime)(Classpaths.configSettings)
// settings that are not specific to a configuration // settings that are not specific to a configuration