Skip to content

add sbt 1.0.0-RC3 support, fixes #216 #229

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 6 commits into from
Aug 7, 2017
Merged

Conversation

rockjam
Copy link
Contributor

@rockjam rockjam commented Jul 24, 2017

This PR adds support for sbt 1.0.0-RC2 which is close to upcoming 1.0.0 release

@rockjam
Copy link
Contributor Author

rockjam commented Jul 24, 2017

scalajs test fails for 0.13 for some reason. Both on CI and my local machine

@rockjam
Copy link
Contributor Author

rockjam commented Jul 24, 2017

Also, it's not possible to run scalajs tests for 1.0.0-RC2 until scala-js/scala-js#3075 released as scalajs doesn't support sbt 1.0.0-RC2 yet

@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.16-RC1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

sbt 0.13.16-RC1 allows to make cross building without plugin. Not sure we should merge it before 0.13.16 final release

@rockjam
Copy link
Contributor Author

rockjam commented Jul 24, 2017

scalajs test fails for 0.13 for some reason. Both on CI and my local machine

This one is fixed

@rockjam rockjam changed the title add sbt 1.0.0-RC2 support, fixes #216 add sbt 1.0.0-RC3 support, fixes #216 Jul 30, 2017
@rockjam
Copy link
Contributor Author

rockjam commented Jul 30, 2017

All tests passed at CI. Also upgraded sbt versions to 0.13.16 and 1.0.0-RC3 respectively

@gslowikowski
Copy link
Member

Hi @rockjam

Thank you for your PR. I've tested it. The code can be slightly simplified. Could you change the line:

        val scoverageDeps: Seq[File] = Deps.scoverageDeps(updateReport, ScoveragePluginConfig.name)

to

        val scoverageDeps: Seq[File] = updateReport matching configurationFilter(ScoveragePluginConfig.name)

and remove src/main/scala-sbt-0.13 and src/main/scala-sbt-1.0 directories?

@rockjam
Copy link
Contributor Author

rockjam commented Aug 3, 2017

@gslowikowski Done! Thanks for advice

@larsrh
Copy link

larsrh commented Aug 5, 2017

A release for sbt 1.0.x would be much appreciated! There are many builds who use this.

@gslowikowski gslowikowski merged commit 20c9c75 into scoverage:master Aug 7, 2017
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