Skip to content

Merge 1.0.x to master (i.e. 1.1.x) #115

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
merged 31 commits into from
May 4, 2017

Conversation

gourlaysama
Copy link
Contributor

Conflicts:

  • .travis.yml
  • README.md
  • build.sbt

gourlaysama and others added 30 commits December 16, 2016 18:54
bump scala, sbt & scala-js dependency versions
Update latest API link, add getting started link
link to Programming in Scala from README.md
I did a preliminary conversion of https://wiki.scala-lang.org/display/SW/Parser+Combinators--Getting+Started to markdown.

It might be a bit large for the README - we could either move it to its own file, or iterate on it to make it a bit more to-the-point.
Add "Getting Started" section to README
speed up Travis builds using caching feature
…cala.util.parsing.json

Deprecate scala.util.parsing.json
 * Links to scala-lang.org/api/... for types from the Scala library
 * Diagrams (if graphviz is around)
 * Links to the source on GitHub (only for released versions)
 * Html pages didn't even a title, they do now
For tags of the form `v1.2.3-suffix#2.13.0-M1`, the build script
releases version `1.2.3-suffix` using Scala version `2.13.0-M1`.

This allows building an existing tag against a new Scala version.
Allow building an existing tag against a new Scala version
Update scala version in README and build.sbt
 Conflicts:
	.travis.yml
	README.md
	build.sbt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants