Merge pull request #34 from xuwei-k/jdk11

add jdk11 test
kxbmap · Oct 3, 2018 · e3213d7 · e3213d7
2 parents 547b16d + 5e1fe80
commit e3213d7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,10 @@ matrix:
   exclude:
   - scala: 2.13.0-M4
     env: SBT_TASK=docs/tut
+  include:
+  - scala: 2.12.7
+    env: SBT_TASK=core/test
+    jdk: openjdk11
 
 script:
   - sbt ++$TRAVIS_SCALA_VERSION $SBT_TASK

diff --git a/core/src/main/scala/configs/ConfigReader.scala b/core/src/main/scala/configs/ConfigReader.scala
@@ -403,7 +403,7 @@ sealed abstract class ConfigReaderInstances extends ConfigReaderInstances0 {
   implicit lazy val javaPropertiesConfigReader: ConfigReader[ju.Properties] =
     ConfigReader[ju.Map[String, String]].map { m =>
       val p = new ju.Properties()
-      p.putAll(m)
+      (p: java.util.Hashtable[AnyRef, AnyRef]).putAll(m)
       p
     }
 

diff --git a/core/src/test/scala/configs/testutil/instance/collection.scala b/core/src/test/scala/configs/testutil/instance/collection.scala
@@ -71,7 +71,7 @@ object collection {
   implicit lazy val javaPropertiesGen: Gen[ju.Properties] =
     Gen[ju.Map[String, String]].map { m =>
       val p = new ju.Properties()
-      p.putAll(m)
+      (p: java.util.Hashtable[AnyRef, AnyRef]).putAll(m)
       p
     }
 

diff --git a/project/Common.scala b/project/Common.scala
@@ -12,7 +12,7 @@ object Common extends AutoPlugin {
 
     val typesafeConfig = "com.typesafe" % "config" % "1.3.3"
 
-    val lombok = "org.projectlombok" % "lombok" % "1.16.20"
+    val lombok = "org.projectlombok" % "lombok" % "1.18.2"
 
     val scalaJava8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0"
 

diff --git a/project/Release.scala b/project/Release.scala
@@ -67,7 +67,7 @@ object Release extends AutoPlugin {
     val org = x.get(organization).replaceAll("\\.", "\\.")
     val dep = s"""libraryDependencies \\+= "$org" %% ".+" % "(.+)"""".r
     val src = x.get(readmeFileSource)
-    val updated = IO.read(src).lines.map {
+    val updated = augmentString(IO.read(src)).lines.map {
       case line@dep(ver) => line.replace(ver, releaseVer)
       case line => line
     }.mkString("", "\n", "\n")