Skip to content

Merge branch '0.9.x' into master #5195

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

Jump to bottom
Merged
merged 8 commits into from
Oct 3, 2018
Merged

Merge branch '0.9.x' into master #5195

merged 8 commits into from
Oct 3, 2018
+241 −133

Conversation

allanrenucci
Copy link
Contributor

No description provided.

allanrenucci and others added 8 commits July 5, 2018 17:49
@allanrenucci
Release Dotty 0.9.0-RC1
8b21d12
@liufengyun @allanrenucci
fix cygwin which has problem with unix pipes
46dd97f
@smarter
[backport] vscode-dotty: don't show the output channel on server error
93da62a 
This is a backport of 37cec1d to the
0.9 branch. Since this only affects the vscode client we won't need to
make a new dotty release, just a new vscode-dotty release.
@smarter
Upgrade coursier to 1.1.0-M7
aca27a0 
This is a backport of ff01801 to the
0.9 branch
@smarter
Release vscode-dotty 0.1.5 for real
4aca19e
@smarter
Merge pull request scala#5126 from dotty-staging/ide-backport
30d98bf 
Release vscode-dotty 0.1.5 with some backports
@allanrenucci
Release Dotty 0.9.0
cde4b6d
@allanrenucci
Merge branch '0.9.x' into master
0dfb476
@allanrenucci
Copy link
Contributor Author

@smarter I had conflicts in package-lock.json. I ran npm install to regenerate the file. Was it the right thing to do?

@smarter
Copy link
Member

smarter commented Oct 3, 2018 •
edited
Loading

Is your npm up to date?

smarter
smarter approved these changes Oct 3, 2018
View reviewed changes
Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the generation of package-lock.json isn't stable ¯\_(ツ)_/¯

@allanrenucci allanrenucci merged commit 8ef3ec4 into scala:master Oct 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smarter smarter smarter 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.
3 participants
@allanrenucci @smarter @liufengyun