Add resources to jvm-native, embedded resources, add back common

build.sbt

@@ -156,7 +156,10 @@ lazy val sconfig = crossProject(JVMPlatform, NativePlatform, JSPlatform)
   .nativeConfigure(_.enablePlugins(ScalaNativeJUnitPlugin))
   .nativeSettings(
     crossScalaVersions := versions,
-    nativeConfig ~= (_.withLinkStubs(true)),
+    nativeConfig ~= (
+      _.withLinkStubs(true)
+        .withEmbedResources(true)
+    ),
     logLevel := Level.Info, // Info or Debug
     libraryDependencies += "org.ekrich" %%% "sjavatime" % javaTime % "provided"
   )

sconfig/js/src/main/scala/org/ekrich/config/PlatformConfigFactory.scala

@@ -3,4 +3,4 @@ package org.ekrich.config
 /**
  * [[ConfigFactory]] methods for Scala.js platform
  */
-abstract class PlatformConfigFactory {}
+abstract class PlatformConfigFactory extends ConfigFactoryCommon {}

sconfig/jvm-native/src/main/scala/org/ekrich/config/ConfigFactoryJvmNative.scala

@@ -3,4 +3,4 @@ package org.ekrich.config
 /**
  * [[ConfigFactory]] methods common to JVM and Native
  */
-abstract class ConfigFactoryJvmNative {}
+abstract class ConfigFactoryJvmNative extends ConfigFactoryCommon {}

sconfig/jvm-native/src/test/resources/a_1.conf

@@ -0,0 +1 @@
+a=1

sconfig/jvm-native/src/test/resources/b_2.conf

@@ -0,0 +1 @@
+b=2

sconfig/jvm-native/src/test/resources/bom.conf

@@ -0,0 +1,2 @@
+#
+foo = bar

sconfig/jvm-native/src/test/resources/cycle.conf

@@ -0,0 +1 @@
+include "cycle.conf"

sconfig/jvm-native/src/test/resources/equiv01/comments.conf

@@ -0,0 +1,45 @@
+{  // These are some integers
+    "ints" : { # we can comment them with # too
+        "fortyTwo" : 42, ## double-# !
+        "fortyTwoAgain" : 42 # { }
+    },
+######## COMMENT COMMENT COMMENT
+/// I COMMENT YOU
+    "floats" : {
+        "fortyTwoPointOne" : 42.1,
+        "fortyTwoPointOneAgain" : 42.1
+        // I CAN HAS COMMENT
+    },
+
+    "strings" : {
+        "abcd" : // I got yr comment right here
+  "abcd",
+        "abcdAgain" : "abcd",
+        "a" : "a",
+        "b" : "b",
+        "c" : "c",
+        "d" : "d",
+        "concatenated" # more to say?
+: "null bar 42 baz true 3.14 hi"
+    },
+
+    "arrays" : {
+        "empty" : [],
+        "1" : [ 1 ],
+        "12" : [1, 2],
+        "123" : [1, 2, 3],
+        "ofString" : [ "a", "b", "c" ]
+    },
+
+    "booleans" : {
+        "true" : true,
+        "trueAgain" : true,
+        "false" : false,
+        "falseAgain" : false
+    },
+
+    "nulls" : {
+        "null" : null,
+        "nullAgain" : null
+    }
+}

sconfig/jvm-native/src/test/resources/equiv01/equals.conf

@@ -0,0 +1,41 @@
+{
+    "ints" = {
+        "fortyTwo" = 42,
+        "fortyTwoAgain" = 42
+    },
+
+    "floats" = {
+        "fortyTwoPointOne" = 42.1,
+        "fortyTwoPointOneAgain" = 42.1
+    },
+
+    "strings" = {
+        "abcd" = "abcd",
+        "abcdAgain" = "abcd",
+        "a" = "a",
+        "b" = "b",
+        "c" = "c",
+        "d" = "d",
+        "concatenated" = "null bar 42 baz true 3.14 hi"
+    },
+
+    "arrays" = {
+        "empty" = [],
+        "1" = [ 1 ],
+        "12" = [1, 2],
+        "123" = [1, 2, 3],
+        "ofString" = [ "a", "b", "c" ]
+    },
+
+    "booleans" = {
+        "true" = true,
+        "trueAgain" = true,
+        "false" = false,
+        "falseAgain" = false
+    },
+
+    "nulls" = {
+        "null" = null,
+        "nullAgain" = null
+    }
+}

sconfig/jvm-native/src/test/resources/equiv01/no-commas.conf

@@ -0,0 +1,55 @@
+{
+    "ints" : {
+        "fortyTwo" : 42
+        "fortyTwoAgain" : 42
+    }
+
+    "floats" : {
+        "fortyTwoPointOne" : 42.1
+        "fortyTwoPointOneAgain" : 42.1
+    }
+
+    "strings" : {
+        "abcd" : "abcd"
+        "abcdAgain" : "abcd"
+        "a" : "a"
+        "b" : "b"
+        "c" : "c"
+        "d" : "d"
+        "concatenated" : "null bar 42 baz true 3.14 hi"
+    }
+
+    "arrays" : {
+        "empty" : []
+        "1" : [ 1 ]
+        "12" : [1
+                2]
+        "123" : [1
+                 2
+                 3 ]
+        "ofString" : [
+
+"a"
+  "b"
+  "c"
+
+]
+    }
+
+    "booleans" : {
+
+        "true" : true
+
+        "trueAgain" : true
+
+        "false" : false
+
+        "falseAgain" : false
+
+    }
+
+    "nulls" : {
+        "null" : null
+        "nullAgain" : null
+    }
+}

sconfig/jvm-native/src/test/resources/equiv01/no-root-braces.conf

@@ -0,0 +1,40 @@
+"ints" : {
+    "fortyTwo" : 42,
+    "fortyTwoAgain" : 42
+},
+
+"floats" : {
+    "fortyTwoPointOne" : 42.1,
+    "fortyTwoPointOneAgain" : 42.1
+},
+
+"strings" : {
+    "abcd" : "abcd",
+    "abcdAgain" : "abcd",
+    "a" : "a",
+    "b" : "b",
+    "c" : "c",
+    "d" : "d",
+    "concatenated" : "null bar 42 baz true 3.14 hi"
+},
+
+"arrays" : {
+    "empty" : [],
+    "1" : [ 1 ],
+    "12" : [1, 2],
+    "123" : [1, 2, 3],
+    "ofString" : [ "a", "b", "c" ]
+},
+
+"booleans" : {
+    "true" : true,
+    "trueAgain" : true,
+    "false" : false,
+    "falseAgain" : false
+},
+
+"nulls" : {
+    "null" : null,
+    "nullAgain" : null
+}
+

sconfig/jvm-native/src/test/resources/equiv01/no-whitespace.json

@@ -0,0 +1 @@
+{"ints":{"fortyTwo":42,"fortyTwoAgain":42},"floats":{"fortyTwoPointOne":42.1,"fortyTwoPointOneAgain":42.1},"strings":{"abcd":"abcd","abcdAgain":"abcd","a":"a","b":"b","c":"c","d":"d","concatenated":"null bar 42 baz true 3.14 hi"},"arrays":{"empty":[],"1":[1],"12":[1,2],"123":[1,2,3],"ofString":["a","b","c"]},"booleans":{"true":true,"trueAgain":true,"false":false,"falseAgain":false},"nulls":{"null":null,"nullAgain":null}}

sconfig/jvm-native/src/test/resources/equiv01/omit-colons.conf

@@ -0,0 +1,44 @@
+{
+    "ints" {
+        "fortyTwo" : 42,
+        "fortyTwoAgain" : 42
+    },
+
+    "floats"
+{
+        "fortyTwoPointOne" : 42.1,
+        "fortyTwoPointOneAgain" : 42.1
+    },
+
+    "strings"   
+
+   {
+        "abcd" : "abcd",
+        "abcdAgain" : "abcd",
+        "a" : "a",
+        "b" : "b",
+        "c" : "c",
+        "d" : "d",
+        "concatenated" : "null bar 42 baz true 3.14 hi"
+    },
+
+    "arrays"            {    
+        "empty" : [],
+        "1" : [ 1 ],
+        "12" : [1, 2],
+        "123" : [1, 2, 3],
+        "ofString" : [ "a", "b", "c" ]
+    },
+
+    "booleans" {
+        "true" : true,
+        "trueAgain" : true,
+        "false" : false,
+        "falseAgain" : false
+    },
+
+    "nulls" {
+        "null" : null,
+        "nullAgain" : null
+    }
+}

sconfig/jvm-native/src/test/resources/equiv01/original.json

@@ -0,0 +1,41 @@
+{
+    "ints" : {
+        "fortyTwo" : 42,
+        "fortyTwoAgain" : 42
+    },
+
+    "floats" : {
+        "fortyTwoPointOne" : 42.1,
+        "fortyTwoPointOneAgain" : 42.1
+    },
+
+    "strings" : {
+        "abcd" : "abcd",
+        "abcdAgain" : "abcd",
+        "a" : "a",
+        "b" : "b",
+        "c" : "c",
+        "d" : "d",
+        "concatenated" : "null bar 42 baz true 3.14 hi"
+    },
+
+    "arrays" : {
+        "empty" : [],
+        "1" : [ 1 ],
+        "12" : [1, 2],
+        "123" : [1, 2, 3],
+        "ofString" : [ "a", "b", "c" ]
+    },
+
+    "booleans" : {
+        "true" : true,
+        "trueAgain" : true,
+        "false" : false,
+        "falseAgain" : false
+    },
+
+    "nulls" : {
+        "null" : null,
+        "nullAgain" : null
+    }
+}

sconfig/jvm-native/src/test/resources/equiv01/path-keys.conf

@@ -0,0 +1,29 @@
+{
+    ints.fortyTwo : 42,
+    ints.fortyTwoAgain : 42,
+
+    floats.fortyTwoPointOne : 42.1,
+    floats.fortyTwoPointOneAgain : 42.1,
+
+    strings.abcd : "abcd",
+    strings.abcdAgain : "abcd",
+    strings.a : "a",
+    strings.b : "b",
+    strings.c : "c",
+    strings.d : "d",
+    strings.concatenated : "null bar 42 baz true 3.14 hi",
+
+    arrays."empty" : [],
+    arrays."1" : [ 1 ],
+    arrays.12 : [1, 2],
+    arrays.123 : [1, 2, 3],
+    arrays.ofString : [ "a", "b", "c" ],
+
+    booleans.true : true,
+    booleans.trueAgain : true,
+    booleans.false : false,
+    booleans.falseAgain : false,
+
+    nulls.null : null,
+    nulls.nullAgain : null
+}

sconfig/jvm-native/src/test/resources/equiv01/properties-style.conf

@@ -0,0 +1,37 @@
+# this file is in a no-braces java properties style,
+# but it's a .conf file with json-style escaping,
+# not a Java properties file.
+# lots of playing with whitespace and commas
+# in here to test various cases; don't copy
+# this as exemplary, it has gratuitously
+# stupid formatting.
+ints.fortyTwo=42
+ints.fortyTwoAgain = 42  // whitespace ignored around the =
+floats.fortyTwoPointOne=42.1
+floats.fortyTwoPointOneAgain:42.1 // colon is fine too
+strings.abcd=abcd
+strings.abcdAgain : "abcd",  // colon and quotes and comma!
+strings.a=a
+strings.b=b
+strings.c="c",
+strings.d:"d"
+strings.concatenated=null bar 42 baz true 3.14 hi # this gets squished to a string
+arrays.empty=[]
+arrays.1 : [ 1 ]
+# it's allowed to omit commas in arrays if you have newlines
+arrays.12 = [
+ 1
+ 2
+]
+arrays.123 = [1,
+2
+3]
+arrays.ofString = [ "a", "b", "c" ]
+booleans.true=true
+booleans.trueAgain=${booleans.true}
+booleans.false=false
+# you could quote keys, though here it's pointless
+# since the key contains no special characters
+"booleans"."falseAgain" : ${booleans.false},
+nulls.null=${nulls.nullAgain}
+nulls.nullAgain=null