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

lots of upgrades to stuff #147

Merged
merged 2 commits into from
Oct 26, 2015
Merged

Conversation

SethTisue
Copy link
Member

most of this isn't so important to have in the 2.11.x-jdk6 build,
since the action is in 2.11.x-jdk8 and 2.12.x, but lately I'm favoring
upgrading stuff here first where possible and then merging the changes
forward

green run w/ these changes:
https://scala-ci.typesafe.com/job/scala-2.11.x-integrate-community-build/114/

let's see if this works before attempting to go even newer

(for the record: yes, a test run of this worked)
* add resolver that can resolve sbteclipse-plugin version 2.4.0,
  so we don't have to fork projects that use it (e.g. scalariform
  and scalamock)
* unfork Scalariform and ScalaMock
* upgrade ScalaTest from 2.1.x to 2.2.x
  (on branch recommended by Bill)
* add spray-json-shapeless, now that we have current Shapeless
* use newer ENSIME (possible now that we have spray-json-shapeless)
SethTisue added a commit that referenced this pull request Oct 26, 2015
@SethTisue SethTisue merged commit 383ad7c into scala:2.11.x Oct 26, 2015
@SethTisue SethTisue deleted the upgrade-scalatest branch October 26, 2015 17:28
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.

None yet

1 participant