diff --git a/build.sbt b/build.sbt index 6854715..50412da 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) scalaVersion := "3.3.4", libraryDependencies ++= Seq( - "com.typesafe" % "config" % "1.4.3", + "ma.chinespirit" %% "jig" % "0.1.0", "org.scalameta" %% "munit" % "1.0.3" % Test, ), diff --git a/src/main/scala/summer/phrasebook/HoconLoader.scala b/src/main/scala/summer/phrasebook/HoconLoader.scala index aadce81..53bb47d 100644 --- a/src/main/scala/summer/phrasebook/HoconLoader.scala +++ b/src/main/scala/summer/phrasebook/HoconLoader.scala @@ -1,6 +1,7 @@ package summer.phrasebook -import com.typesafe.config.{Config, ConfigFactory, ConfigValueType} +import machinespir.it.jig.{Config, ConfigFactory} +import org.ekrich.config.ConfigValueType import java.nio.file.{Files, Path} import scala.jdk.CollectionConverters.* @@ -39,10 +40,10 @@ object HoconLoader: /** Flatten a Typesafe Config into a string map. */ def flatten(config: Config): Map[String, String] = val builder = Map.newBuilder[String, String] - for entry <- config.entrySet().asScala do + for entry <- config.entrySet.asScala do val key = entry.getKey.nn val value = entry.getValue.nn - value.valueType() match + value.valueType match case ConfigValueType.STRING | ConfigValueType.NUMBER | ConfigValueType.BOOLEAN => builder += key -> config.getString(key).nn case ConfigValueType.NULL =>