Merge pull request #1387 from alexarchambault/config-module-java-8

Make config module compatible with Java 8
VirtusLab · Sep 22, 2022 · 06f07dc · 06f07dc
2 parents b79464d + b953571
commit 06f07dc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/build.sc b/build.sc
@@ -445,12 +445,15 @@ class Config(val crossScalaVersion: String) extends ScalaCliCrossSbtModule
       if (crossScalaVersion.startsWith("2.12.")) Seq(Deps.collectionCompat)
       else Nil
     super.ivyDeps() ++ maybeCollectionCompat ++ Agg(
-      Deps.jsoniterCore
+      Deps.jsoniterCoreJava8
     )
   }
   def compileIvyDeps = super.compileIvyDeps() ++ Agg(
-    Deps.jsoniterMacros
+    Deps.jsoniterMacrosJava8
   )
+  def scalacOptions = T {
+    super.scalacOptions() ++ Seq("-release", "8")
+  }
 
   // Disabling Scalafix in 2.13 and 3, so that it doesn't remove
   // some compatibility-related imports, that are actually only used

diff --git a/modules/config/src/main/scala-2.12/scala/cli/config/Util.scala b/modules/config/src/main/scala-2.12/scala/cli/config/Util.scala
@@ -6,7 +6,7 @@ private[config] object Util {
     def toBooleanOption: Option[Boolean] =
       try Some(s.toBoolean)
       catch {
-        case e: IllegalArgumentException =>
+        case _: IllegalArgumentException =>
           None
       }
   }

diff --git a/modules/config/src/main/scala/scala/cli/config/PasswordOption.scala b/modules/config/src/main/scala/scala/cli/config/PasswordOption.scala
@@ -60,7 +60,7 @@ object PasswordOption extends LowPriorityPasswordOption {
   }
   final case class File(path: Path) extends PasswordOption {
     def get(): Secret[String] = {
-      val value = Files.readString(path) // trim that?
+      val value = new String(Files.readAllBytes(path), StandardCharsets.UTF_8) // trim that?
       Secret(value)
     }
     override def getBytes(): Secret[Array[Byte]] = {

diff --git a/project/deps.sc b/project/deps.sc
@@ -58,13 +58,14 @@ object InternalDeps {
 object Deps {
   object Versions {
     // jni-utils version may need to be sync-ed when bumping the coursier version
-    def coursier      = "2.1.0-M6-53-gb4f448130"
-    def coursierCli   = "2.1.0-M5-18-gfebf9838c"
-    def jsoniterScala = "2.17.3"
-    def scalaMeta     = "4.5.13"
-    def scalaNative   = "0.4.7"
-    def scalaPackager = "0.1.28"
-    def signingCli    = "0.1.9"
+    def coursier           = "2.1.0-M6-53-gb4f448130"
+    def coursierCli        = "2.1.0-M5-18-gfebf9838c"
+    def jsoniterScala      = "2.17.3"
+    def jsoniterScalaJava8 = "2.13.5"
+    def scalaMeta          = "4.5.13"
+    def scalaNative        = "0.4.7"
+    def scalaPackager      = "0.1.28"
+    def signingCli         = "0.1.9"
   }
   // DO NOT hardcode a Scala version in this dependency string
   // This dependency is used to ensure that Ammonite is available for Scala versions
@@ -95,8 +96,12 @@ object Deps {
     ivy"com.github.plokhotnyuk.jsoniter-scala:jsoniter-scala-core_2.13:${Versions.jsoniterScala}"
   def jsoniterCore =
     ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-core:${Versions.jsoniterScala}"
+  def jsoniterCoreJava8 =
+    ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-core:${Versions.jsoniterScalaJava8}"
   def jsoniterMacros =
     ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScala}"
+  def jsoniterMacrosJava8 =
+    ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScalaJava8}"
   def libdaemonjvm  = ivy"io.github.alexarchambault.libdaemon::libdaemon:0.0.10"
   def libsodiumjni  = ivy"io.github.alexarchambault.tmp.libsodiumjni:libsodiumjni:0.0.3"
   def macroParadise = ivy"org.scalamacros:::paradise:2.1.1"