diff --git a/.travis.yml b/.travis.yml index ad8e699f..e28b1e73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,13 +23,18 @@ env: script: admin/build.sh +addons: + apt: + packages: + - openjdk-6-jdk + jdk: - openjdk6 - oraclejdk8 notifications: email: - - adriaan.moors@typesafe.com + - adriaan.moors@lightbend.com - antoine@gourlay.fr before_cache: diff --git a/LICENSE.md b/LICENSE.md index c9f2ca8a..d536dec9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,5 @@ -Copyright (c) 2002-2013 EPFL -Copyright (c) 2011-2013 Typesafe, Inc. +Copyright (c) 2002-2018 EPFL +Copyright (c) 2011-2018 Lightbend, Inc. All rights reserved. @@ -25,4 +25,4 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index acb59a29..027f6bd6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -scala-parser-combinators [](https://travis-ci.org/scala/scala-parser-combinators) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.12*) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala-parser-combinators) +scala-parser-combinators [](https://travis-ci.org/scala/scala-parser-combinators) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.12) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala-parser-combinators) ======================== ### Scala Standard Parser Combinator Library @@ -18,7 +18,7 @@ As of Scala 2.11, this library is a separate jar that can be omitted from Scala To depend on scala-parser-combinators in SBT, add something like this to your build.sbt: ``` -libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.6" +libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.7" ``` (Assuming you're using a `scalaVersion` for which a scala-parser-combinators is published. The first 2.11 milestone for which this is true is 2.11.0-M4.) @@ -60,7 +60,7 @@ For a detailed unpacking of this example see Scala-parser-combinators directly supports scala-js 0.6+, starting with v1.0.5: ``` -libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "1.0.6" +libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "1.0.7" ``` ## Contributing diff --git a/build.sbt b/build.sbt index 4e9be07f..b2c052c0 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ import ScalaModulePlugin._ scalaVersionsByJvm in ThisBuild := { - val v211 = "2.11.11" - val v212 = "2.12.2" - val v213 = "2.13.0-M1" + val v211 = "2.11.12" + val v212 = "2.12.4" + val v213 = "2.13.0-M3" Map( 6 -> List(v211 -> true), @@ -19,10 +19,15 @@ lazy val root = project.in(file(".")) lazy val `scala-parser-combinators` = crossProject.in(file(".")). settings(scalaModuleSettings: _*). + jvmSettings(scalaModuleSettingsJVM). settings( - name := "scala-parser-combinators-root", + name := "scala-parser-combinators", + version := "1.1.0-SNAPSHOT", + mimaPreviousVersion := None, + apiMappings += (scalaInstance.value.libraryJar -> url(s"https://www.scala-lang.org/api/${scalaVersion.value}/")), + scalacOptions in (Compile, doc) ++= Seq( "-diagrams", "-doc-source-url", @@ -36,32 +41,15 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")). ) ). jvmSettings( - // Mima uses the name of the jvm project in the artifactId - // when resolving previous versions (so no "-jvm" project) - name := "scala-parser-combinators" - ). - jsSettings( - name := "scala-parser-combinators-js" - ). - settings( - moduleName := "scala-parser-combinators", - version := "1.1.0-SNAPSHOT" - ). - jvmSettings( - OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}") + OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"), + libraryDependencies += "junit" % "junit" % "4.12" % "test", + libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" ). jsSettings( // Scala.js cannot run forked tests fork in Test := false ). - jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)). - jvmSettings( - libraryDependencies += "junit" % "junit" % "4.12" % "test", - libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" - ). - jvmSettings( - mimaPreviousVersion := None - ) + jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)) lazy val `scala-parser-combinatorsJVM` = `scala-parser-combinators`.jvm lazy val `scala-parser-combinatorsJS` = `scala-parser-combinators`.js diff --git a/project/build.properties b/project/build.properties index 64317fda..133a8f19 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.17 diff --git a/project/plugins.sbt b/project/plugins.sbt index 4420c3b0..6fcd9b89 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.13") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.16") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")