Skip to content

Commit

Permalink
annotate return type Seq[Setting[_]] for several methods in Defaults
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
harrah committed Jun 19, 2011
1 parent a028f8e commit 4c770e8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions main/Defaults.scala
Expand Up @@ -222,7 +222,7 @@ object Defaults extends BuildCommon
def unmanagedResourcesTask(dirs: Seq[File], excl: FileFilter) =
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) },
testFrameworks in GlobalScope :== {
import sbt.TestFrameworks._
Expand Down Expand Up @@ -281,12 +281,12 @@ object Defaults extends BuildCommon
Tests.discover(frameworkMap.values.toSeq, analysis, s.log)._1
}

lazy val packageBase = Seq(
lazy val packageBase: Seq[Setting[_]] = Seq(
artifact <<= normalizedName(n => Artifact(n)),
packageOptions in GlobalScope :== Nil,
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 }
) ++
packageTasks(packageBin, packageBinTask) ++
Expand Down Expand Up @@ -497,14 +497,14 @@ object Defaults extends BuildCommon

lazy val baseTasks: Seq[Setting[_]] = projectTasks ++ packageBase

lazy val baseClasspaths = Classpaths.publishSettings ++ Classpaths.baseSettings
lazy val configSettings = Classpaths.configSettings ++ configTasks ++ configPaths ++ packageConfig ++ Classpaths.compilerPluginConfig
lazy val baseClasspaths: Seq[Setting[_]] = Classpaths.publishSettings ++ Classpaths.baseSettings
lazy val configSettings: Seq[Setting[_]] = Classpaths.configSettings ++ configTasks ++ configPaths ++ packageConfig ++ Classpaths.compilerPluginConfig

lazy val compileSettings = configSettings ++ (mainRunMainTask +: mainRunTask +: addBaseSources)
lazy val testSettings = configSettings ++ testTasks
lazy val compileSettings: Seq[Setting[_]] = configSettings ++ (mainRunMainTask +: mainRunTask +: addBaseSources)
lazy val testSettings: Seq[Setting[_]] = configSettings ++ testTasks

lazy val itSettings = inConfig(IntegrationTest)(testSettings)
lazy val defaultConfigs = inConfig(Compile)(compileSettings) ++ inConfig(Test)(testSettings) ++ inConfig(Runtime)(Classpaths.configSettings)
lazy val itSettings: Seq[Setting[_]] = inConfig(IntegrationTest)(testSettings)
lazy val defaultConfigs: Seq[Setting[_]] = inConfig(Compile)(compileSettings) ++ inConfig(Test)(testSettings) ++ inConfig(Runtime)(Classpaths.configSettings)


// settings that are not specific to a configuration
Expand Down

0 comments on commit 4c770e8

Please sign in to comment.