Skip to content
Closed
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
7 changes: 0 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ language: scala

scala:
- 3.0.0-M1
- 2.11.12
- 2.12.12
- 2.13.3

Expand All @@ -19,11 +18,6 @@ matrix:
exclude:
- scala: 3.0.0-M1
env: ADOPTOPENJDK=8 SCALAJS_VERSION=1.3.0
include:
- scala: 2.11.12
env: ADOPTOPENJDK=8 SCALANATIVE_VERSION=0.3.9
- scala: 2.11.12
env: ADOPTOPENJDK=8 SCALANATIVE_VERSION=0.4.0-M2

install:
- git fetch --tags # get all tags for sbt-dynver
Expand All @@ -32,5 +26,4 @@ script: ./build.sh

notifications:
email:
- adriaan.moors@lightbend.com
- seth.tisue@lightbend.com
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# scala-parser-combinators

[<img src="https://img.shields.io/travis/scala/scala-parser-combinators.svg"/>](https://travis-ci.org/scala/scala-parser-combinators)
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.11)
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.12)
[<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-parser-combinators_2.13.svg?label=latest%20release%20for%202.13"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.13)

### Scala Standard Parser Combinator Library

This library is now community-maintained. If you are interested in helping please contact [@Philippus](https://github.com/philippus) or [@SethTisue](https://github.com/SethTisue).

As of Scala 2.11, this library is a separate jar that can be omitted from Scala projects that do not use Parser Combinators.
This library is community-maintained. If you are interested in helping please contact [@Philippus](https://github.com/philippus) or [@SethTisue](https://github.com/SethTisue).

## Documentation

Expand All @@ -27,9 +24,9 @@ libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" %

To support multiple Scala versions, see the example in [scala/scala-module-dependency-sample](https://github.com/scala/scala-module-dependency-sample).

### Scala.js and Scala Native
### Scala.js

Scala-parser-combinators is also available for Scala.js 0.6+ and Scala Native:
Scala-parser-combinators is also available for Scala.js:

```
libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "1.1.2"
Expand Down
14 changes: 2 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
lazy val root = project.in(file("."))
.aggregate(parserCombinatorsJVM, parserCombinatorsJS, parserCombinatorsNative)
.aggregate(parserCombinatorsJVM, parserCombinatorsJS)
.settings(
publish / skip := true,
)

lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)
lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform)
.in(file("."))
.settings(
ScalaModulePlugin.scalaModuleSettings,
Expand Down Expand Up @@ -83,16 +83,6 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
Test / fork := false
)
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
.nativeSettings(
compile / skip := System.getProperty("java.version").startsWith("1.6") || !scalaVersion.value.startsWith("2.11"),
test := {},
libraryDependencies := {
if (!scalaVersion.value.startsWith("2.11"))
libraryDependencies.value.filterNot(_.organization == "org.scala-native")
else libraryDependencies.value
}
)

lazy val parserCombinatorsJVM = parserCombinators.jvm
lazy val parserCombinatorsJS = parserCombinators.js
lazy val parserCombinatorsNative = parserCombinators.native
2 changes: 0 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ isReleaseJob() {

if [[ "$SCALAJS_VERSION" != "" ]]; then
projectPrefix="parserCombinatorsJS/"
elif [[ "$SCALANATIVE_VERSION" != "" ]]; then
projectPrefix="parserCombinatorsNative/"
else
projectPrefix="parserCombinatorsJVM/"
fi
Expand Down
26 changes: 0 additions & 26 deletions native/src/main/scala/scala/util/parsing/input/PositionCache.scala

This file was deleted.

11 changes: 2 additions & 9 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.3.0")

val scalaNativeVersion =
Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9")

addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.3")

val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.3.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)

addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)

addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
package scala.util.parsing.input

private[input] trait ScalaVersionSpecificPagedSeq[T] {
// Nothing for 2.11 and 2.12!
}
// Nothing for 2.12!
}