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
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6c52b6a
bump scala, sbt & scala-js dependency versions
gourlaysama Dec 16, 2016
acddd21
Merge pull request #92 from gourlaysama/bump4
SethTisue Dec 16, 2016
fbf3d08
Update latest API link, add getting started link
raboof Dec 31, 2016
33792d3
Add link to 'Building a lexer and parser with Scala's Parser Combinat…
raboof Dec 31, 2016
94e25a3
Merge pull request #93 from raboof/patch-1
gourlaysama Jan 3, 2017
c0dabd9
Update version and README for v1.0.5
gourlaysama Jan 3, 2017
0e3326f
link to Programming in Scala from README.md
SethTisue Jan 3, 2017
5d733ef
Merge pull request #94 from gourlaysama/update-post-1.0.5
gourlaysama Jan 3, 2017
04a2f50
Merge pull request #95 from SethTisue/odersky-venners-spoon
gourlaysama Jan 3, 2017
7df76d7
Add "Getting Started" section to README
raboof Jan 6, 2017
48dc032
Move 'Getting Started' guide to separate file
raboof Jan 11, 2017
f536e54
Add Getting Started example to the README
raboof Jan 11, 2017
d0d847d
Merge pull request #96 from raboof/getting_started
gourlaysama Jan 19, 2017
f1a47ee
Syntax highlight
ladinu Feb 6, 2017
cf326ad
Merge pull request #98 from ladinu/patch-1
gourlaysama Feb 6, 2017
d901210
speed up Travis builds using caching feature
gourlaysama Feb 8, 2017
5ec6af9
Merge pull request #100 from gourlaysama/travis-caching
gourlaysama Feb 8, 2017
399bbb8
Update Getting_Started.md
zandbee Feb 13, 2017
7815fd9
Deprecate scala.util.parsing.json
janekdb Feb 14, 2017
d118db9
Merge pull request #103 from janekdb/issue/github/99/deprecate-scala.…
gourlaysama Feb 14, 2017
f09b0ec
Merge pull request #102 from Zandbee/patch-1
gourlaysama Feb 15, 2017
6ca3c3d
Improve parser combinator documentation
gourlaysama Feb 20, 2017
eb5bc9a
Merge pull request #106 from gourlaysama/improve-scaladoc-output
gourlaysama Feb 22, 2017
6cac8c3
Allow building an existing tag against a new Scala version
lrytz Apr 20, 2017
26d971a
Also cross-build against 2.13.0-M1
lrytz Apr 25, 2017
0da708b
Merge pull request #109 from lrytz/tag-with-scala-version
gourlaysama Apr 28, 2017
9b705dd
Disable publishing of root project
gourlaysama May 2, 2017
65802b5
Merge pull request #112 from gourlaysama/no-root-publish
gourlaysama May 2, 2017
0982f5e
Update scala version in README and build.sbt
gourlaysama May 2, 2017
2cb29f8
Merge pull request #114 from gourlaysama/bump4
gourlaysama May 2, 2017
5a972f2
Merge branch '1.0.x' into merge-1.0.x-master
gourlaysama May 3, 2017
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
Prev Previous commit
Next Next commit
Also cross-build against 2.13.0-M1
  • Loading branch information
lrytz committed Apr 28, 2017
commit 26d971a1345becbb581b3ed6255a5857bbb92580
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import ScalaModulePlugin._

scalaVersionsByJvm in ThisBuild := {
val v212 = "2.12.2"
val v211 = "2.11.11"
val v212 = "2.12.2"
val v213 = "2.13.0-M1"

Map(
6 -> List(v211 -> true),
7 -> List(v211 -> false),
8 -> List(v212 -> true, v211 -> false),
9 -> List(v212 -> false, v211 -> false)
8 -> List(v212 -> true, v213 -> true, v211 -> false),
9 -> List(v212 -> false, v213 -> false, v211 -> false)
)
}

Expand Down