diff --git a/.travis.yml b/.travis.yml index d70ccae6..6fa20b41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,20 +24,20 @@ jobs: - env: TEST="linux" before_install: ./scripts/travis-os-setup.sh script: sbt +test doc - - env: TEST="linux" SCALAJS_VERSION=1.0.1 + - env: TEST="linux" SCALAJS_VERSION=1.1.1 script: sbt +sconfigJS/test - env: TEST="linux" jdk: openjdk11 before_install: ./scripts/travis-os-setup.sh script: sbt +test - - env: TEST="linux" SCALAJS_VERSION=1.0.1 + - env: TEST="linux" SCALAJS_VERSION=1.1.1 jdk: openjdk11 script: sbt +sconfigJS/test - stage: release script: - export CI_SONATYPE_RELEASE=version # to avoid release (valid command) - sbt ci-release - - export SCALAJS_VERSION=1.0.1 + - export SCALAJS_VERSION=1.1.1 - export CI_RELEASE=";+sconfigJS/publishSigned" - export CI_SONATYPE_RELEASE=sonatypeBundleRelease - export CI_CLEAN=version # don't clean first diff --git a/README.md b/README.md index c1f8d801..95c4aab3 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,9 @@ libraryDependencies += "org.ekrich" %% "sconfig" % "x.y.z" To use in `sbt`, replace `x.y.z` with the version from Maven Central badge above. Use `%%%` for non-JVM projects. All available versions can be seen at the [Maven Repository](https://mvnrepository.com/artifact/org.ekrich/sconfig). +## Cross Build Versions +[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0.svg)](https://www.scala-js.org) + | Scala Version | JVM | Scala.js (0.6.x, 1.x) | Native (0.4.x) | | ---------------------- | :-: | :-------------------: | :------------: | | 2.11.x | ✅ | ✅ | ✅ | diff --git a/build.sbt b/build.sbt index c67ece0a..114558bc 100644 --- a/build.sbt +++ b/build.sbt @@ -45,9 +45,9 @@ scalacOptions in (Compile, console) --= Seq( ) val scala211 = "2.11.12" -val scala212 = "2.12.11" -val scala213 = "2.13.2" -val dotty = "0.24.0-RC1" +val scala212 = "2.12.12" +val scala213 = "2.13.3" +val dotty = "0.26.0-RC1" val versionsBase = Seq(scala211, scala212, scala213) val versionsJVM = versionsBase :+ dotty diff --git a/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java b/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java index fb575deb..c9d80fc9 100644 --- a/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java +++ b/examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java @@ -18,10 +18,7 @@ public SimpleLibContext(Config config) { // path so we only validate settings that belong to this // library. Otherwise, we might throw mistaken errors about // settings we know nothing about. - - // Comment out for dotty compiling - // See https://github.com/lampepfl/dotty/issues/7212 - //config.checkValid(ConfigFactory.defaultReference(), "simple-lib"); + config.checkValid(ConfigFactory.defaultReference(), "simple-lib"); } // This uses the standard default Config, if none is provided, diff --git a/project/build.properties b/project/build.properties index 797e7ccf..0837f7a1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.10 +sbt.version=1.3.13 diff --git a/project/plugins.sbt b/project/plugins.sbt index 2504e77c..6460db60 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ val crossVer = "0.6.1" val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")) .filter(_.nonEmpty) - .getOrElse("0.6.32") + .getOrElse("0.6.33") val scalaNativeVersion = Option(System.getenv("SCALANATIVE_VERSION")) .filter(_.nonEmpty) .getOrElse("0.4.0-M2") diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/impl/Parseable.scala b/sconfig/shared/src/main/scala/org/ekrich/config/impl/Parseable.scala index 3b6be809..d17a82c3 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/impl/Parseable.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/impl/Parseable.scala @@ -189,7 +189,7 @@ object Parseable { postConstruct(options) } @throws[IOException] - override protected def reader = + override protected def reader() = throw new ConfigException.BugOrBroken( "reader() without options should not be called on ParseableURL" ) @@ -346,7 +346,7 @@ object Parseable { with Relativizer { postConstruct(options) @throws[IOException] - override protected def reader = + override protected def reader() = throw new ConfigException.BugOrBroken( "reader() should not be called on resources" ) @@ -449,7 +449,7 @@ object Parseable { ) extends Parseable(options) { postConstruct(options) @throws[IOException] - override protected def reader = + override protected def reader() = throw new ConfigException.BugOrBroken( "reader() should not be called on props" ) diff --git a/sconfig/shared/src/main/scala/org/ekrich/config/impl/SimpleConfig.scala b/sconfig/shared/src/main/scala/org/ekrich/config/impl/SimpleConfig.scala index 5e9550fa..709a9a57 100644 --- a/sconfig/shared/src/main/scala/org/ekrich/config/impl/SimpleConfig.scala +++ b/sconfig/shared/src/main/scala/org/ekrich/config/impl/SimpleConfig.scala @@ -984,14 +984,6 @@ final class SimpleConfig private[impl] (val confObj: AbstractConfigObject) override def isResolved: Boolean = root.resolveStatus eq ResolveStatus.RESOLVED - // This method in Config uses @varargs so it can be called from Java with varargs - // See https://github.com/scala/bug/issues/10658 - // originally: @Override public void checkValid(Config reference, String... restrictToPaths) - // Now the code goes through the Scala varargs method but we need this one for Java - def checkValid(reference: Config, restrictToPaths: Array[String]): Unit = { - checkValid(reference, restrictToPaths.toIndexedSeq: _*) - } - override def checkValid(reference: Config, restrictToPaths: String*): Unit = { val ref = reference.asInstanceOf[SimpleConfig] // unresolved reference config is a bug in the caller of checkValid