diff --git a/.travis.yml b/.travis.yml index 5627249..6d3abcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ scala: - 2.10.7 - 2.11.12 - 2.12.8 - - 2.13.0 + - 2.13.3 jdk: - oraclejdk8 - openjdk8 diff --git a/build.sbt b/build.sbt index 4aa39a5..8da01a1 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ lazy val project = Project("project", file(".")) description := "A Scala-friendly wrapper companion for Typesafe config", startYear := Some(2013), scalaVersion := "2.12.8", - crossScalaVersions := Seq("2.10.7", "2.11.12", scalaVersion.value, "2.13.0"), + crossScalaVersions := Seq("2.10.7", "2.11.12", scalaVersion.value, "2.13.3"), scalacOptions ++= Seq( "-feature", "-deprecation", diff --git a/project/plugins.sbt b/project/plugins.sbt index 5a977b9..9d1d95b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += "Typesafe Repository" at "https://repo.typesafe.com/typesafe/releases/" -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7") diff --git a/src/main/scala-2.13+/macrocompat/bundle.scala b/src/main/scala-2.13+/macrocompat/bundle.scala index 3cc6cde..5949dec 100644 --- a/src/main/scala-2.13+/macrocompat/bundle.scala +++ b/src/main/scala-2.13+/macrocompat/bundle.scala @@ -1,3 +1,3 @@ package macrocompat -class bundle +class bundle extends scala.annotation.Annotation diff --git a/src/main/scala-2.13+/net/ceedubs/ficus/readers/CollectionReaders.scala b/src/main/scala-2.13+/net/ceedubs/ficus/readers/CollectionReaders.scala index fcaf525..21f1ca4 100644 --- a/src/main/scala-2.13+/net/ceedubs/ficus/readers/CollectionReaders.scala +++ b/src/main/scala-2.13+/net/ceedubs/ficus/readers/CollectionReaders.scala @@ -20,7 +20,7 @@ trait CollectionReaders { val entryConfig = entry.atPath(DummyPathValue) builder += entryReader.read(entryConfig, DummyPathValue) } - builder.result + builder.result() } } diff --git a/src/main/scala-2.13-/net/ceedubs/ficus/readers/CollectionReaders.scala b/src/main/scala-2.13-/net/ceedubs/ficus/readers/CollectionReaders.scala index 9aad140..548e969 100644 --- a/src/main/scala-2.13-/net/ceedubs/ficus/readers/CollectionReaders.scala +++ b/src/main/scala-2.13-/net/ceedubs/ficus/readers/CollectionReaders.scala @@ -19,7 +19,7 @@ trait CollectionReaders { val entryConfig = entry.atPath(DummyPathValue) builder += entryReader.read(entryConfig, DummyPathValue) } - builder.result + builder.result() } }