diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/scalajs/ScalaJs.scala | 2 | ||||
-rw-r--r-- | plugins/scalajs/ScalaJsInformation.scala | 2 | ||||
-rw-r--r-- | plugins/scalatest/ScalaTest.scala | 4 | ||||
-rw-r--r-- | plugins/scalatest/build/build.scala | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/scalajs/ScalaJs.scala b/plugins/scalajs/ScalaJs.scala index bde3307..1a31683 100644 --- a/plugins/scalajs/ScalaJs.scala +++ b/plugins/scalajs/ScalaJs.scala @@ -14,7 +14,7 @@ trait ScalaJsSbtDependencyDsl extends SbtDependencyDsl { self: ScalaJsBuild => } } -trait ScalaJsBuild extends BasicBuild with ScalaJsSbtDependencyDsl with ScalaJsInformation { outer => +trait ScalaJsBuild extends BaseBuild with ScalaJsSbtDependencyDsl with ScalaJsInformation { outer => def sharedFolder = projectDirectory ++ "/shared" def jvmFolder = projectDirectory ++ "/jvm" diff --git a/plugins/scalajs/ScalaJsInformation.scala b/plugins/scalajs/ScalaJsInformation.scala index 938d207..ada3baf 100644 --- a/plugins/scalajs/ScalaJsInformation.scala +++ b/plugins/scalajs/ScalaJsInformation.scala @@ -1,6 +1,6 @@ import cbt._ -trait ScalaJsInformation extends BasicBuild { outer => +trait ScalaJsInformation extends BaseBuild { outer => val sjsVersion = "0.6.8" final private val sjsMajorVersion: String = lib.libMajorVersion(sjsVersion) diff --git a/plugins/scalatest/ScalaTest.scala b/plugins/scalatest/ScalaTest.scala index 53c6446..7f1c77a 100644 --- a/plugins/scalatest/ScalaTest.scala +++ b/plugins/scalatest/ScalaTest.scala @@ -11,7 +11,7 @@ import org.scalatest Probably by adding support for subfolders to "GitDependency" */ -trait SbtLayout extends BasicBuild{ +trait SbtLayout extends BaseBuild{ outer => override def sources = Seq( projectDirectory ++ "/src/main/scala" ) def testSources = projectDirectory ++ "/src/test/scala" @@ -28,7 +28,7 @@ trait SbtLayout extends BasicBuild{ else None } -trait ScalaTest extends BasicBuild{ +trait ScalaTest extends BaseBuild{ override def run: ExitCode = { import ScalaTestLib._ val _classLoader = classLoader(context.classLoaderCache) diff --git a/plugins/scalatest/build/build.scala b/plugins/scalatest/build/build.scala index 1377fa8..55d5818 100644 --- a/plugins/scalatest/build/build.scala +++ b/plugins/scalatest/build/build.scala @@ -3,7 +3,7 @@ import java.net.URL import java.io.File import scala.collection.immutable.Seq -class Build(context: Context) extends BasicBuild(context){ +class Build(val context: Context) extends BaseBuild{ override def dependencies = super.dependencies ++ Resolver( mavenCentral ).bind( |