From e7a21be0ca3cf7152b5798317fff346220caae32 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 29 Mar 2017 08:36:39 -0400 Subject: make .scala sources 2.12 compatible --- stage1/Stage1Lib.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'stage1/Stage1Lib.scala') 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))) -- cgit v1.2.3