Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Get everything ready to release 1.1.0 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gourlaysama merged 31 commits into scala:master from gourlaysama:merge-1.0.x-master-2
Feb 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
39f303c
Update to sbt-scala-module 1.0.12
lrytz Jul 11, 2017
8414ba2
Merge pull request #120 from lrytz/sbt-osgi-0.9.1
gourlaysama Jul 17, 2017
bbb18fb
Fix build anme to scala-parser-combinators
lrytz Jul 17, 2017
1d73570
Initial support for Scala Native
Jun 19, 2017
1d825f6
Setup travis for native compilation
Jun 19, 2017
0cf4ce6
Run Precise on TravisCI
Jun 20, 2017
ee2513f
Upgrade Scala Native
Jul 11, 2017
fed1867
Skip compilation in Java 6
Jul 17, 2017
31895c5
Run Travis build in Trusty
Jul 17, 2017
ed16889
Configure Travis via a script
Jul 17, 2017
4f28290
Run on Trusty
Jul 17, 2017
7370390
Remove Scala Native dependencies when not in Scala 2.11
Jul 17, 2017
ecb0d4e
Merge pull request #121 from lrytz/build-name-fix
gourlaysama Jul 19, 2017
dc35849
Move to scala 2.12.3 & 2.13.0-M2
gourlaysama Jul 28, 2017
615b70f
Merge pull request #123 from gourlaysama/bump-scala-version
gourlaysama Jul 28, 2017
c70911d
Merge branch '1.0.x' into native
Jul 30, 2017
fd760fc
Merge pull request #118 from alonsodomin/native
gourlaysama Jul 31, 2017
59e13ca
Fix 2.12 release badge
gourlaysama Aug 21, 2017
21aa25a
Merge pull request #125 from gourlaysama/fix-badge
gourlaysama Aug 21, 2017
90ea0dd
Travis makes us work harder now to actually get OpenJDK 6
SethTisue Oct 19, 2017
daf9fe2
Merge pull request #131 from SethTisue/travis-openjdk6-fix
SethTisue Oct 19, 2017
16b7c0c
Fix js and native project names
gourlaysama Nov 4, 2017
18e1a75
bump sbt & plugin versions.
gourlaysama Nov 4, 2017
1f108e5
Merge pull request #132 from gourlaysama/fix-native-support
gourlaysama Nov 6, 2017
ba11bea
Revert "Merge pull request #118 from alonsodomin/native"
gourlaysama Jan 31, 2018
853697c
update scala & plugin dependencies
gourlaysama Jan 31, 2018
f225fb0
Merge pull request #135 from gourlaysama/revert-scala-native
gourlaysama Jan 31, 2018
fff8f8f
bump various version numbers
SethTisue Feb 1, 2018
dc88d4d
Merge pull request #137 from SethTisue/bump-versions
gourlaysama Feb 1, 2018
c35ff2e
Merge branch '1.0.x' into merge-1.0.x-master-2
gourlaysama Feb 1, 2018
7d209b4
Update scala version to 2.13.0-M3
gourlaysama Feb 1, 2018
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: 6 additions & 1 deletion .travis.yml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions LICENSE.md
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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.
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 3 additions & 3 deletions README.md
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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*) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala-parser-combinators)
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) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala-parser-combinators)
========================

### Scala Standard Parser Combinator Library
Expand All @@ -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.)
Expand Down Expand Up @@ -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
Expand Down
38 changes: 13 additions & 25 deletions build.sbt
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
Expand All @@ -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",
Expand All @@ -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
2 changes: 1 addition & 1 deletion project/build.properties
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=0.13.17
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

AltStyle によって変換されたページ (->オリジナル) /