diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-29 08:36:39 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-01 23:35:35 -0400 |
| commit | e7a21be0ca3cf7152b5798317fff346220caae32 (patch) | |
| tree | 542a04bb1f3c55913fdc1b90d1e20f2e7bb636fb /stage2 | |
| parent | ec29b9f38711b2bb33b51e9bc220c17c7d09fcce (diff) | |
| download | cbt-e7a21be0ca3cf7152b5798317fff346220caae32.tar.gz cbt-e7a21be0ca3cf7152b5798317fff346220caae32.tar.bz2 cbt-e7a21be0ca3cf7152b5798317fff346220caae32.zip | |
make .scala sources 2.12 compatible
Diffstat (limited to 'stage2')
| -rw-r--r-- | stage2/BasicBuild.scala | 4 | ||||
| -rw-r--r-- | stage2/LazyDependency.scala | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 2cf97e5..88922d9 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -17,7 +17,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with SbtDep // will create new instances given the context, which means operations in the // overrides will happen multiple times and if they are not idempotent stuff likely breaks def context: Context - lazy val moduleKey: String = "BaseBuild("+target.string+")" + override lazy val moduleKey: String = "BaseBuild("+target.string+")" implicit def transientCache: java.util.Map[AnyRef,AnyRef] = context.transientCache implicit def libraries(implicit context: Context): libraries = new libraries(context, scalaVersion) @@ -153,7 +153,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with SbtDep "-unchecked" ) - final def lastModified: Long = compile.getOrElse(0L) + override final def lastModified: Long = compile.getOrElse(0L) def triggerLoopFiles: Set[File] = sources.toSet diff --git a/stage2/LazyDependency.scala b/stage2/LazyDependency.scala index afc6263..2822638 100644 --- a/stage2/LazyDependency.scala +++ b/stage2/LazyDependency.scala @@ -1,11 +1,11 @@ package cbt class LazyDependency( _dependency: => Dependency )( implicit logger: Logger, transientCache: java.util.Map[AnyRef, AnyRef], classLoaderCache: ClassLoaderCache ) extends Dependency { lazy val dependency = _dependency - def classLoader = dependency.classLoader + override def classLoader = dependency.classLoader def dependenciesArray = Array( dependency ) def exportedClasspathArray = Array() - def lastModified = dependency.lastModified - lazy val moduleKey = show + override def lastModified = dependency.lastModified + override lazy val moduleKey = show def show = s"LazyDependency(${dependency.show})" override def toString = show override def equals( other: Any ) = other match { |