Skip to content

Merge 1.0.x into master #51

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.

Sign up for GitHub

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 7 commits into from
May 8, 2015
+7 −8
Merged

Merge 1.0.x into master #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
127aa45
[backport] Fix misleading error message when using optional or repeat…
Nov 24, 2014
ca9fae1
Merge pull request #49 from gourlaysama/backports
gourlaysama Apr 15, 2015
4e0277b
move to scala 2.11.6 and sbt 0.13.8
gourlaysama Apr 22, 2015
0b6d642
Merge pull request #50 from gourlaysama/bump-scala-version
gourlaysama Apr 23, 2015
689d179
Update the scala-modules plugin to 1.0.3
lrytz Apr 30, 2015
aa98174
update version numbers for v1.0.4
lrytz Apr 30, 2015
753933b
Merge branch '1.0.x' into merge-1.0.x
lrytz Apr 30, 2015
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
script:
- admin/build.sh
scala:
- 2.11.4
- 2.11.6
jdk:
- openjdk6
- openjdk7
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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.3"
libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
```

(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
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ name := "scala-parser-combinators"

version := "1.1.0-SNAPSHOT"

scalaVersion := "2.11.4"

snapshotScalaBinaryVersion := "2.11"
scalaVersion := "2.11.6"

// important!! must come here (why?)
scalaModuleOsgiSettings
Expand All @@ -20,3 +18,5 @@ fork in Test := true
libraryDependencies += "junit" % "junit" % "4.11" % "test"

libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"

mimaPreviousVersion := None
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.7
sbt.version=0.13.8
3 changes: 1 addition & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.2")

addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.3")