From f7b84e735e150578324caa0c4289404a033cd9b2 Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Sun, 3 Apr 2016 23:49:20 -0400
Subject: Finally get rid of JDK 8 dependencies

---
 stage1/Stage1.scala   | 11 +++++------
 stage1/logger.scala   | 10 +++-------
 stage1/resolver.scala |  4 +++-
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'stage1')

diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala
index 050d494..3456e1f 100644
--- a/stage1/Stage1.scala
+++ b/stage1/Stage1.scala
@@ -1,7 +1,6 @@
 package cbt
 
 import java.io._
-import java.time.LocalTime.now
 
 import scala.collection.immutable.Seq
 import scala.collection.JavaConverters._
@@ -50,9 +49,9 @@ object Stage1{
     a.lastModified > b.lastModified
   }
 
-  def run(_args: Array[String], classLoader: ClassLoader, _cbtChanged: java.lang.Boolean): Int = {
+  def run(_args: Array[String], classLoader: ClassLoader, _cbtChanged: java.lang.Boolean, start: java.lang.Long): Int = {
     val args = Stage1ArgsParser(_args.toVector)
-    val logger = new Logger(args.enabledLoggers)
+    val logger = new Logger(args.enabledLoggers, start)
     logger.stage1(s"Stage1 start")
 
     val lib = new Stage1Lib(logger)
@@ -70,12 +69,12 @@ object Stage1{
       zincVersion = "0.3.9", scalaVersion = constants.scalaVersion
     )
 
-    logger.stage1(s"[$now] calling CbtDependency.classLoader")
+    logger.stage1(s"calling CbtDependency.classLoader")
     if(cbtHasChanged){
       NailgunLauncher.stage2classLoader = CbtDependency().classLoader(classLoaderCache)
     }
 
-    logger.stage1(s"[$now] Run Stage2")
+    logger.stage1(s"Run Stage2")
     val exitCode = (
       NailgunLauncher.stage2classLoader.loadClass(
         if(args.admin) "cbt.AdminStage2" else "cbt.Stage2"
@@ -95,7 +94,7 @@ object Stage1{
         case _ => ExitCode.Success
       }
     ).integer
-    logger.stage1(s"[$now] Stage1 end")
+    logger.stage1(s"Stage1 end")
     return exitCode;
   }
 }
diff --git a/stage1/logger.scala b/stage1/logger.scala
index e513443..91a2412 100644
--- a/stage1/logger.scala
+++ b/stage1/logger.scala
@@ -1,7 +1,5 @@
 package cbt
 
-import java.time._
-
 /**
  * This represents a logger with namespaces that can  be enabled or disabled as needed. The
  * namespaces are defined using {{enabledLoggers}}. Possible values are defined in the subobject
@@ -9,13 +7,11 @@ import java.time._
  *
  * We can replace this with something more sophisticated eventually.
  */
-case class Logger(enabledLoggers: Set[String]) {
-  def this(enabledLoggers: Option[String]) = this( enabledLoggers.toVector.flatMap( _.split(",") ).toSet )
-
-  val start = LocalTime.now()
+case class Logger(enabledLoggers: Set[String], start: Long) {
+  def this(enabledLoggers: Option[String], start: Long) = this( enabledLoggers.toVector.flatMap( _.split(",") ).toSet, start )
 
   def log(name: String, msg: => String) = {
-    val timeTaken = (Duration.between(start, LocalTime.now()).toMillis.toDouble / 1000).toString
+    val timeTaken = ((start - System.currentTimeMillis) / 1000).toString
     System.err.println( s"[${" "*(6-timeTaken.size)}$timeTaken][$name] $msg" )
   }
 
diff --git a/stage1/resolver.scala b/stage1/resolver.scala
index ea20b89..e8bfc07 100644
--- a/stage1/resolver.scala
+++ b/stage1/resolver.scala
@@ -1,5 +1,6 @@
 package cbt
 import java.nio.file._
+import java.nio.charset.StandardCharsets
 import java.net._
 import java.io._
 import scala.collection.immutable.Seq
@@ -323,7 +324,8 @@ case class BoundMavenDependency(
 
   private def resolveHash(suffix: String) = {
     Files.readAllLines(
-      resolve( suffix ++ ".sha1", None ).toPath
+      resolve( suffix ++ ".sha1", None ).toPath,
+      StandardCharsets.UTF_8
     ).mkString("\n").split(" ").head.trim
   }
   
-- 
cgit v1.2.3