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

Conversation

Copy link
Contributor

@gourlaysama gourlaysama commented Feb 1, 2018
edited
Loading

This:

  • merges 1.0.x into master
  • bumps the scala version to 2.13.0-M3 (and sbt to 0.13.17)

Then we can release 1.1.0 with 2.13.0-M3 support 🎉!

SethTisue reacted with thumbs up emoji
lrytz and others added 27 commits July 11, 2017 16:15
Add osgi settings only to the `JVM` project. In the JS project they
caused the resulting jar to be empty.
Fixes scala#119
Adds MiMa checking to the JS jar.
Minor cleanups in the build definition.
The sbt plugin sets `repoName := name.value`, not the other way around.
Fix build anme to scala-parser-combinators
Travis makes us work harder now to actually get OpenJDK 6
sbt-crossproject already handles that, but naming them by hand changed
the name of the produced artifacts
(`scala-parser-combinators-js_sjs0.6_2.12-...`).
Fix js/native support & bump sbt and plugins versions
This reverts commit fd760fc, reversing
changes made to 615b70f.
 Conflicts:
	build.sbt
	project/plugins.sbt
Copy link
Member

you should probably merge #137 and then merge it forward here, too

Copy link
Contributor Author

@SethTisue done.

SethTisue reacted with thumbs up emoji

@gourlaysama gourlaysama merged commit 6377358 into scala:master Feb 1, 2018
@gourlaysama gourlaysama deleted the merge-1.0.x-master-2 branch February 1, 2018 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SethTisue SethTisue SethTisue approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

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