Skip to content
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

Some cleanup, ahead of API work #216

Merged
merged 3 commits into from
Jul 23, 2014
Merged

Conversation

huitseeker
Copy link
Member

rebased on #213

@huitseeker
Copy link
Member Author

Now rebased on #217 !

Luc Bourlier and others added 3 commits July 22, 2014 17:16
Update to latest version of plugin-profiles to use Scala 2.11.1
Add direct dependency to scala-xml and scala-parser-combinators
Unused imports, members, and deprecations.

Didn't touch
TemplateCompilationunitTest/ActionContentAssistProcessorTest, for
which tests fail already anyway.
Conflicts:
	org.scala-ide.play2/src/org/scalaide/play2/templateeditor/compiler/CompilerUsing.scala
@ghprb-bot
Copy link

Test PASSed.
Refer to this link for build results: https://jenkins.scala-ide.org:8496/jenkins/job/ghprb-play-validator/31/

@dragos
Copy link
Member

dragos commented Jul 23, 2014

LGTM! Thanks for cleaning this up!

@huitseeker
Copy link
Member Author

\o/

huitseeker added a commit that referenced this pull request Jul 23, 2014
Some cleanup, ahead of API work
@huitseeker huitseeker merged commit ae7a197 into scala-ide:master Jul 23, 2014
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.

3 participants