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 /stage1 | |
parent | ec29b9f38711b2bb33b51e9bc220c17c7d09fcce (diff) | |
download | cbt-e7a21be0ca3cf7152b5798317fff346220caae32.tar.gz cbt-e7a21be0ca3cf7152b5798317fff346220caae32.tar.bz2 cbt-e7a21be0ca3cf7152b5798317fff346220caae32.zip |
make .scala sources 2.12 compatible
Diffstat (limited to 'stage1')
-rw-r--r-- | stage1/Stage1Lib.scala | 3 | ||||
-rw-r--r-- | stage1/resolver.scala | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index 392b885..1698621 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -314,9 +314,10 @@ ${sourceFiles.sorted.mkString(" \\\n")} .map( dejavafy ) .orElse{ (cacheFile.exists && cacheFile.lastModified > cbtLastModified).option{ - import collection.JavaConversions._ + import collection.JavaConverters._ val v = Files .readAllLines( cacheFile.toPath, StandardCharsets.UTF_8 ) + .asScala .toStream .map( deserialize ) persistentCache.put(key, Array(System.currentTimeMillis:java.lang.Long, javafy(v))) diff --git a/stage1/resolver.scala b/stage1/resolver.scala index 6134a16..48099e5 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -108,7 +108,7 @@ trait DependencyImplementation extends Dependency{ def flatClassLoader: Boolean = false - def classLoader: ClassLoader = taskCache[DependencyImplementation]( "classLoader" ).memoize{ + override def classLoader: ClassLoader = taskCache[DependencyImplementation]( "classLoader" ).memoize{ if( flatClassLoader ){ new java.net.URLClassLoader(classpath.strings.map(f => new URL("file://" ++ f)).toArray) } else { @@ -170,13 +170,13 @@ case class BinaryDependency( paths: Seq[File], dependencies: Seq[Dependency] )(i def exportedClasspath = ClassPath(paths) override def lastModified = paths.map(_.lastModifiedRecursive).max // FIXME: cache this def targetClasspath = exportedClasspath - lazy val moduleKey = this.getClass.getName + "(" + paths.mkString(", ") + ")" // PERFORMANCE HOTSPOT + override lazy val moduleKey = this.getClass.getName + "(" + paths.mkString(", ") + ")" // PERFORMANCE HOTSPOT } /** Allows to easily assemble a bunch of dependencies */ case class Dependencies( dependencies: Seq[Dependency] )(implicit val logger: Logger, val transientCache: java.util.Map[AnyRef,AnyRef], val classLoaderCache: ClassLoaderCache) extends DependencyImplementation{ override def lastModified = dependencies.map(_.lastModified).maxOption.getOrElse(0) - lazy val moduleKey = this.getClass.getName + "(" + dependencies.map(_.moduleKey).mkString(", ") + ")" // PERFORMANCE HOTSPOT + override lazy val moduleKey = this.getClass.getName + "(" + dependencies.map(_.moduleKey).mkString(", ") + ")" // PERFORMANCE HOTSPOT def targetClasspath = ClassPath() def exportedClasspath = ClassPath() override def show: String = this.getClass.getSimpleName + "( " + dependencies.map(_.show).mkString(", ") + " )" @@ -184,7 +184,7 @@ case class Dependencies( dependencies: Seq[Dependency] )(implicit val logger: Lo case class PostBuildDependency(target: File, _dependencies: Seq[DependencyImplementation])(implicit val logger: Logger, val transientCache: java.util.Map[AnyRef,AnyRef], val classLoaderCache: ClassLoaderCache) extends DependencyImplementation{ override final lazy val lastModified = (target++".last-success").lastModified - lazy val moduleKey = target.string + override lazy val moduleKey = target.string override def show = s"PostBuildDependency($target)" override def targetClasspath = exportedClasspath override def exportedClasspath = ClassPath( Seq(target) ) @@ -246,7 +246,7 @@ case class BoundMavenDependency( )( implicit val logger: Logger, val transientCache: java.util.Map[AnyRef,AnyRef], val classLoaderCache: ClassLoaderCache ) extends ArtifactInfo with DependencyImplementation{ - lazy val moduleKey = this.getClass.getName + "(" + mavenDependency.serialize + ")" // PERFORMANCE HOTSPOT + override lazy val moduleKey = this.getClass.getName + "(" + mavenDependency.serialize + ")" // PERFORMANCE HOTSPOT override def hashCode = mavenDependency.hashCode override def equals(other: Any) = other match{ case o: BoundMavenDependency => o.mavenDependency == mavenDependency && o.repositories == repositories @@ -284,7 +284,7 @@ case class BoundMavenDependency( def exportedJars = Seq( jar ) override def exportedClasspath = ClassPath( exportedJars ) override def targetClasspath = exportedClasspath - import scala.collection.JavaConversions._ + import scala.collection.JavaConverters._ private def resolve(suffix: String, hash: Option[String], useClassifier: Boolean): File = { logger.resolver(lib.blue("Resolving ")+this) @@ -304,7 +304,7 @@ case class BoundMavenDependency( val result = Files.readAllLines( path, StandardCharsets.UTF_8 - ).mkString("\n").split(" ").head.trim + ).asScala.mkString("\n").split(" ").head.trim classLoaderCache.hashMap.put("hash:"+path, result) result } |