publish v0.9.96 with new --scala:2.12 flag

Thanks @johanneshiry!
carueda · Feb 28, 2020 · 0c2034f · 0c2034f
1 parent 771d011
commit 0c2034f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,10 +1,10 @@
-2020-02-27 - 0.9.96
+2020-02-28 - 0.9.96
+
+- publish v0.9.96 with new `--scala:2.12` flag. Thanks @johanneshiry!
 
 - some adjustments triggered by #59 "switch to scala 2.13 and remove deprecation warning for JavaConverters"
     - cross build to 2.13 (besides 2.12)
     - fix a bunch of warnings in general
-    - TODO generate scala code also for 2.13, unless a new flag is used to continue targetting 2.12
-      as proposed
 
 2019-10-07 - 0.9.95
 

diff --git a/src/main/scala/tscfg/gen4tests.scala b/src/main/scala/tscfg/gen4tests.scala
@@ -29,6 +29,7 @@ object gen4tests {
       }
 
       opts foreach {
+        case "--scala:2.12"      => genOpts = genOpts.copy(s12 = true)
         case "--scala:bt"        => genOpts = genOpts.copy(useBackticks = true)
         case "--java:getters"    => genOpts = genOpts.copy(genGetters = true)
         case "--java:optionals"  => genOpts = genOpts.copy(useOptionals = true)

diff --git a/src/main/scala/tscfg/generators/scala/ScalaGen.scala b/src/main/scala/tscfg/generators/scala/ScalaGen.scala
@@ -484,7 +484,7 @@ private[scala] class Accessors {
     val scalaCollectionConverter = if (s12) "scala.collection.JavaConverters._" else "scala.jdk.CollectionConverters._"
     val methodDef =
       s"""  private def $methodName(cl:com.typesafe.config.ConfigList, parentPath: java.lang.String, $$tsCfgValidator: $$TsCfgValidator): scala.List[$scalaType] = {
-         |  import $scalaCollectionConverter
+         |    import $scalaCollectionConverter
          |    cl.asScala.map(cv => $elem).toList
          |  }""".stripMargin
     (methodName, methodDef)

diff --git a/src/main/tscfg/example/issue59.spec.conf b/src/main/tscfg/example/issue59.spec.conf
@@ -1,2 +1,2 @@
-// GenOpts: --scala:12
+// GenOpts: --scala:2.12
 foolist = [string]