Permalink
Browse files

= Prepare for 2.1.5 release

  • Loading branch information...
sirthias committed Sep 14, 2018
1 parent 805a510 commit 066d5ad9b432fa572ab08652acb063d7cef45e9e
Showing with 35 additions and 27 deletions.
  1. +8 −0 CHANGELOG
  2. +3 −3 README.rst
  3. +24 −24 build.sbt
View
@@ -1,3 +1,11 @@
Version 2.1.5 (2018-09-14)
--------------------------
- Fixed `valueMap` not matching longest key first (#136)
- Added `valueMap` with `ignoreCase`
- Upgraded to Scala.js 0.6.24
- Build for Scala 2.13.0-M4
Version 2.1.4 (2017-01-24)
--------------------------
- Fixed `andNot` implementation (#167)
View
@@ -49,12 +49,12 @@ The artifacts for *parboiled2* live on `Maven Central`_ and can be tied into you
.. code:: Scala
libraryDependencies += "org.parboiled" %% "parboiled" % "2.1.4"
libraryDependencies += "org.parboiled" %% "parboiled" % "2.1.5"
The latest released version is **2.1.4**. It is available for Scala 2.11, Scala 2.12 as well as Scala.js 0.6.
The latest released version is **2.1.5**. It is available for Scala 2.11, 2.12, 2.13-M4 as well as Scala.js 0.6.
*parboiled2* has only one single dependency that it will transitively pull into your classpath: shapeless_
(currently version 2.3.2).
(currently version 2.3.3).
**Note:** If your project also uses ``"io.spray" %% "spray-routing"``
you'll need to change this to ``"io.spray" %% "spray-routing-shapeless2"`` in order for
View
@@ -2,11 +2,12 @@ import com.typesafe.sbt.SbtScalariform.ScalariformKeys
import scalariform.formatter.preferences._
import scala.xml.transform._
import scala.xml.{Node => XNode, NodeSeq}
import sbtcrossproject.{CrossType, crossProject}
import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject}
import sbtcrossproject.CrossPlugin.autoImport._
val commonSettings = Seq(
version := "2.1.5-SNAPSHOT",
scalaVersion := "2.11.12",
version := "2.1.5",
scalaVersion := "2.12.6",
crossScalaVersions := Seq("2.11.12", "2.12.6", "2.13.0-M4"),
organization := "org.parboiled",
homepage := Some(new URL("http://parboiled.org")),
@@ -21,10 +22,8 @@ val commonSettings = Seq(
"-Xlint:deprecation"),
scalacOptions ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, v)) if v <= 11 =>
Seq("-target:jvm-1.6")
case _ =>
Nil
case Some((2, v)) if v <= 11 => Seq("-target:jvm-1.6")
case _ => Nil
}
},
scalacOptions ++= List(
@@ -87,21 +86,22 @@ lazy val root = project.in(file("."))
.aggregate(examples, jsonBenchmark)
.aggregate(parboiledJVM, parboiledJS)
.aggregate(parboiledCoreJVM, parboiledCoreJS)
.settings(noPublishingSettings: _*)
.settings(commonSettings)
.settings(noPublishingSettings)
lazy val examples = project
.dependsOn(parboiledJVM)
.settings(commonSettings: _*)
.settings(noPublishingSettings: _*)
.settings(commonSettings)
.settings(noPublishingSettings)
.settings(libraryDependencies ++= Seq(specs2Core, "io.spray" %% "spray-json" % "1.3.4"))
lazy val bench = inputKey[Unit]("Runs the JSON parser benchmark with a simple standard config")
lazy val jsonBenchmark = project
.dependsOn(examples)
.enablePlugins(JmhPlugin)
.settings(commonSettings: _*)
.settings(noPublishingSettings: _*)
.settings(commonSettings)
.settings(noPublishingSettings)
.settings(
libraryDependencies ++= Seq(
"org.json4s" %% "json4s-native" % "3.6.0",
@@ -110,20 +110,23 @@ lazy val jsonBenchmark = project
lazy val scalaParser = project
.dependsOn(parboiledJVM)
.settings(commonSettings: _*)
.settings(noPublishingSettings: _*)
.settings(commonSettings)
.settings(noPublishingSettings)
.settings(libraryDependencies ++= Seq(shapeless, specs2Core))
lazy val parboiledOsgiSettings = osgiSettings ++ Seq(
OsgiKeys.exportPackage := Seq("org.parboiled2.*;version=${Bundle-Version}"),
OsgiKeys.privatePackage := Seq()
)
lazy val parboiled = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure)
lazy val parboiledJVM = parboiled.jvm
lazy val parboiledJS = parboiled.js
lazy val parboiled = crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Pure)
.dependsOn(parboiledCore)
.settings(commonSettings: _*)
.settings(formattingSettings: _*)
.settings(publishingSettings: _*)
.settings(commonSettings)
.settings(formattingSettings)
.settings(publishingSettings)
.jvmSettings(
mappings in (Compile, packageBin) ++= (mappings in (parboiledCoreJVM.project, Compile, packageBin)).value,
mappings in (Compile, packageSrc) ++= (mappings in (parboiledCoreJVM.project, Compile, packageSrc)).value,
@@ -147,15 +150,12 @@ lazy val parboiled = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.P
).
enablePlugins(SbtOsgi).settings(parboiledOsgiSettings:_*)
lazy val parboiledJVM = parboiled.jvm
lazy val parboiledJS = parboiled.js
lazy val generateActionOps = taskKey[Seq[File]]("Generates the ActionOps boilerplate source file")
lazy val parboiledCore = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure).in(file("parboiled-core"))
.settings(commonSettings: _*)
.settings(formattingSettings: _*)
.settings(noPublishingSettings: _*)
.settings(commonSettings)
.settings(formattingSettings)
.settings(noPublishingSettings)
.settings(
libraryDependencies ++= Seq(scalaReflect(scalaVersion.value), shapeless, specs2Core, specs2ScalaCheck),
generateActionOps := ActionOpsBoilerplate((sourceManaged in Compile).value, streams.value),

0 comments on commit 066d5ad

Please sign in to comment.