Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add jdk11 test #34

Merged
merged 1 commit into from
Oct 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/configs/ConfigReader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion project/Release.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down