Change package name and update serialization tests (#9)

* Moved files to new package structure
* Fix serialization tests due to change

README.md

@@ -28,6 +28,8 @@ The following changes are needed if migrating from the original Java version.
 - Change the package organization name from `com.typesafe` to `org.ekrich`.
 - Other code sites may require removing `()` where the method just returns state. This is to 
 follow the Scala convention which supports the *uniform access principle* [1].
+- The serialization format has changed due to the package name change. This could
+require special consideration.
 
 The following document copies are local to this repository but internal links may refer to the
 original site documents via hyperlink.

build.sbt

@@ -13,19 +13,31 @@ addCommandAlias(
   ).mkString(";", ";", "")
 )
 
-val configVersion = "0.7.0-SNAPSHOT"
-val scalacOpts    = List("-unchecked", "-deprecation", "-feature")
+val nextVersion = "0.7.0"
+// stable snapshot is not great for publish local
+def versionFmt(out: sbtdynver.GitDescribeOutput): String = {
+  val snap = "-SNAPSHOT"
+  val tag  = out.ref.dropV.value
+  if (out.isCleanAfterTag) tag
+  // out.ref.value in non git project?
+  else nextVersion + "-" + out.ref.value + snap
+}
+
+val scalacOpts = List("-unchecked", "-deprecation", "-feature")
 
-ThisBuild / version := configVersion
 ThisBuild / Compile / scalacOptions := scalacOpts
 ThisBuild / Test / scalacOptions := scalacOpts
 
 ThisBuild / crossScalaVersions := Seq("2.12.8", "2.11.12")
 
 inThisBuild(
   List(
+    version := dynverGitDescribeOutput.value.mkVersion(versionFmt, ""),
+    dynver := sbtdynver.DynVer
+      .getGitDescribeOutput(new java.util.Date)
+      .mkVersion(versionFmt, ""),
     description := "Configuration library for Scala using HOCON files",
-    organization := "org.ekrich", // causes package error not being com.typesafe
+    organization := "org.ekrich",
     homepage := Some(url("https://github.com/ekrich/sconfig")),
     licenses := List(
       "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),

examples/java/complex-app/src/main/java/ComplexApp.java

@@ -1,4 +1,4 @@
-import com.typesafe.config.*;
+import org.ekrich.config.*;
 import simplelib.*;
 
 class ComplexApp {

examples/java/simple-app/src/main/java/SimpleApp.java

@@ -1,4 +1,4 @@
-import com.typesafe.config.*;
+import org.ekrich.config.*;
 import simplelib.*;
 
 class SimpleApp {

examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java

@@ -1,6 +1,6 @@
 package simplelib;
 
-import com.typesafe.config.*;
+import org.ekrich.config.*;
 
 // Whenever you write a library, allow people to supply a Config but
 // also default to ConfigFactory.load if they don't supply one.

examples/scala/complex-app/src/main/scala/ComplexApp.scala

@@ -1,4 +1,4 @@
-import com.typesafe.config._
+import org.ekrich.config._
 import simplelib._
 
 object ComplexApp extends App {

examples/scala/simple-app/src/main/scala/SimpleApp.scala

@@ -1,4 +1,4 @@
-import com.typesafe.config._
+import org.ekrich.config._
 import simplelib._
 
 object SimpleApp extends App {

examples/scala/simple-lib/src/main/scala/simplelib/SimpleLib.scala

@@ -1,6 +1,6 @@
 package simplelib
 
-import com.typesafe.config._
+import org.ekrich.config._
 
 // Whenever you write a library, allow people to supply a Config but
 // also default to ConfigFactory.load if they don't supply one.

sconfig/src/main/java/com/typesafe/config/Optional.java → sconfig/src/main/java/org/ekrich/config/Optional.java

@@ -1,4 +1,4 @@
-package com.typesafe.config;
+package org.ekrich.config;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

sconfig/src/main/scala/com/typesafe/config/Config.scala → sconfig/src/main/scala/org/ekrich/config/Config.scala

@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 import java.time.Duration
 import java.time.Period

sconfig/src/main/scala/com/typesafe/config/ConfigBeanFactory.scala → sconfig/src/main/scala/org/ekrich/config/ConfigBeanFactory.scala

@@ -1,6 +1,6 @@
-package com.typesafe.config
+package org.ekrich.config
 
-import com.typesafe.config.impl.ConfigBeanImpl
+import org.ekrich.config.impl.ConfigBeanImpl
 
 /**
  * Factory for automatically creating a Java class from a [[Config]].

sconfig/src/main/scala/com/typesafe/config/ConfigException.scala → sconfig/src/main/scala/org/ekrich/config/ConfigException.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 import java.io.{
   IOException,
@@ -12,7 +12,7 @@ import java.io.{
 import java.{lang => jl}
 import jl.reflect.Field
 
-import com.typesafe.config.impl.ConfigImplUtil
+import org.ekrich.config.impl.ConfigImplUtil
 
 /**
  * All exceptions thrown by the library are subclasses of

sconfig/src/main/scala/com/typesafe/config/ConfigFactory.scala → sconfig/src/main/scala/org/ekrich/config/ConfigFactory.scala

@@ -1,10 +1,10 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
-import com.typesafe.config.impl.ConfigImpl
-import com.typesafe.config.impl.Parseable
+import org.ekrich.config.impl.ConfigImpl
+import org.ekrich.config.impl.Parseable
 import java.io.{File, Reader}
 import java.net.URL
 import java.{util => ju}

sconfig/src/main/scala/com/typesafe/config/ConfigIncludeContext.scala → sconfig/src/main/scala/org/ekrich/config/ConfigIncludeContext.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * Context provided to a {@link ConfigIncluder}; this interface is only useful

sconfig/src/main/scala/com/typesafe/config/ConfigIncluder.scala → sconfig/src/main/scala/org/ekrich/config/ConfigIncluder.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * Implement this interface and provide an instance to

sconfig/src/main/scala/com/typesafe/config/ConfigIncluderClasspath.scala → sconfig/src/main/scala/org/ekrich/config/ConfigIncluderClasspath.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * Implement this <em>in addition to</em> {@link ConfigIncluder} if you want to

sconfig/src/main/scala/com/typesafe/config/ConfigIncluderFile.scala → sconfig/src/main/scala/org/ekrich/config/ConfigIncluderFile.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 import java.io.File
 

sconfig/src/main/scala/com/typesafe/config/ConfigIncluderURL.scala → sconfig/src/main/scala/org/ekrich/config/ConfigIncluderURL.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 import java.net.URL
 

sconfig/src/main/scala/com/typesafe/config/ConfigList.scala → sconfig/src/main/scala/org/ekrich/config/ConfigList.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 import java.{util => ju}
 

sconfig/src/main/scala/com/typesafe/config/ConfigLoadingStrategy.scala → sconfig/src/main/scala/org/ekrich/config/ConfigLoadingStrategy.scala

@@ -1,4 +1,4 @@
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * This method allows you to alter default config loading strategy for all the code which

sconfig/src/main/scala/com/typesafe/config/ConfigMemorySize.scala → sconfig/src/main/scala/org/ekrich/config/ConfigMemorySize.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * An immutable class representing an amount of memory.  Use

sconfig/src/main/scala/com/typesafe/config/ConfigMergeable.scala → sconfig/src/main/scala/org/ekrich/config/ConfigMergeable.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * Marker for types whose instances can be merged, that is [[Config]] and

sconfig/src/main/scala/com/typesafe/config/ConfigObject.scala → sconfig/src/main/scala/org/ekrich/config/ConfigObject.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 import java.{util => ju}
 

sconfig/src/main/scala/com/typesafe/config/ConfigOrigin.scala → sconfig/src/main/scala/org/ekrich/config/ConfigOrigin.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 import java.net.URL
 import java.util.List

sconfig/src/main/scala/com/typesafe/config/ConfigOriginFactory.scala → sconfig/src/main/scala/org/ekrich/config/ConfigOriginFactory.scala

@@ -1,7 +1,7 @@
-package com.typesafe.config
+package org.ekrich.config
 
 import java.net.URL
-import com.typesafe.config.impl.ConfigImpl
+import org.ekrich.config.impl.ConfigImpl
 
 /**
  * This class contains some static factory methods for building a [[ConfigOrigin]].

sconfig/src/main/scala/com/typesafe/config/ConfigParseOptions.scala → sconfig/src/main/scala/org/ekrich/config/ConfigParseOptions.scala

@@ -1,9 +1,9 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
-import com.typesafe.config.impl.ConfigImplUtil
+import org.ekrich.config.impl.ConfigImplUtil
 
 /**
  * A set of options related to parsing.

sconfig/src/main/scala/com/typesafe/config/ConfigParseable.scala → sconfig/src/main/scala/org/ekrich/config/ConfigParseable.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * An opaque handle to something that can be parsed, obtained from

sconfig/src/main/scala/com/typesafe/config/ConfigRenderOptions.scala → sconfig/src/main/scala/org/ekrich/config/ConfigRenderOptions.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * <p>

sconfig/src/main/scala/com/typesafe/config/ConfigResolveOptions.scala → sconfig/src/main/scala/org/ekrich/config/ConfigResolveOptions.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * A set of options related to resolving substitutions. Substitutions use the

sconfig/src/main/scala/com/typesafe/config/ConfigResolver.scala → sconfig/src/main/scala/org/ekrich/config/ConfigResolver.scala

@@ -1,4 +1,4 @@
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * Implement this interface and provide an instance to

sconfig/src/main/scala/com/typesafe/config/ConfigSyntax.scala → sconfig/src/main/scala/org/ekrich/config/ConfigSyntax.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * The syntax of a character stream (<a href="http://json.org">JSON</a>, <a

sconfig/src/main/scala/com/typesafe/config/ConfigUtil.scala → sconfig/src/main/scala/org/ekrich/config/ConfigUtil.scala

@@ -1,8 +1,8 @@
-package com.typesafe.config
+package org.ekrich.config
 
 import java.{util => ju}
 
-import com.typesafe.config.impl.ConfigImplUtil
+import org.ekrich.config.impl.ConfigImplUtil
 
 import scala.annotation.varargs
 

sconfig/src/main/scala/com/typesafe/config/ConfigValue.scala → sconfig/src/main/scala/org/ekrich/config/ConfigValue.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * An immutable value, following the <a href="http://json.org">JSON</a> type

sconfig/src/main/scala/com/typesafe/config/ConfigValueFactory.scala → sconfig/src/main/scala/org/ekrich/config/ConfigValueFactory.scala

@@ -1,11 +1,11 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 import java.{util => ju}
 import java.{lang => jl}
-import com.typesafe.config.impl.ConfigImpl
+import org.ekrich.config.impl.ConfigImpl
 
 /**
  * This class holds some static factory methods for building {@link ConfigValue}

sconfig/src/main/scala/com/typesafe/config/ConfigValueType.scala → sconfig/src/main/scala/org/ekrich/config/ConfigValueType.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2011-2012 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config
+package org.ekrich.config
 
 /**
  * The type of a configuration value (following the

sconfig/src/main/scala/com/typesafe/config/DefaultConfigLoadingStrategy.scala → sconfig/src/main/scala/org/ekrich/config/DefaultConfigLoadingStrategy.scala

@@ -1,4 +1,4 @@
-package com.typesafe.config
+package org.ekrich.config
 
 import java.io.File
 import java.net.MalformedURLException

sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigNode.scala → sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigNode.scala

@@ -1,9 +1,9 @@
 /**
  *   Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config.impl
+package org.ekrich.config.impl
 
-import com.typesafe.config.parser.ConfigNode
+import org.ekrich.config.parser.ConfigNode
 import java.{util => ju}
 
 abstract class AbstractConfigNode extends ConfigNode {

sconfig/src/main/scala/com/typesafe/config/impl/AbstractConfigNodeValue.scala → sconfig/src/main/scala/org/ekrich/config/impl/AbstractConfigNodeValue.scala

@@ -1,7 +1,7 @@
 /**
  *   Copyright (C) 2015 Typesafe Inc. <http://typesafe.com>
  */
-package com.typesafe.config.impl
+package org.ekrich.config.impl
 
 // This is required if we want
 // to be referencing the AbstractConfigNode class in implementation rather than the