Skip to content

upgrade to sbt 0.13.16 + refresh MiMA + reinstate conductr-lib + add scalastyle + refresh lightbend-emoji #535

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 5 commits into from
Jul 25, 2017

Conversation

SethTisue
Copy link
Member

not to be merged until 0.13.16 final is out. in the meantime,
just helping test the new sbt version. @eed3si9n @dwijnand

@SethTisue
Copy link
Member Author

@SethTisue SethTisue self-assigned this Apr 28, 2017
@dwijnand
Copy link
Member

EXTRACTION FAILED (failed: scala-parser-combinators)

Cyclic reference involving
*:scalaVersion
root-950fabd31421f835198eabd03f5fa1753af44c91/*:crossScalaVersions
root-950fabd31421f835198eabd03f5fa1753af44c91/*:scalaVersion

@SethTisue known?

@SethTisue
Copy link
Member Author

perhaps a recent change in that repo. I'll investigate

@lrytz
Copy link
Member

lrytz commented Apr 28, 2017

[scala-parser-combinators] Commit: 2324d69d24e5540e220c91e46aa07a0962e3b330

This is from Jan 25 scala/scala-parser-combinators@2324d69

@SethTisue
Copy link
Member Author

SethTisue commented Apr 28, 2017

yeah, so this must have to do with the sbt version bump. @dwijnand can you think of a change in 0.13.16-M1 that could affect this somehow?

the scala-parser-combinators build has scalaVersion in ThisBuild := crossScalaVersions.value.head and then the crossScalaVersions doesn't consult any other keys

@SethTisue
Copy link
Member Author

maybe sbt/sbt@ff017eb ?

@eed3si9n
Copy link
Member

maybe sbt/sbt@ff017eb ?

That could be the culprit since I did add scalaVersion at the project level.

@eed3si9n
Copy link
Member

eed3si9n commented May 7, 2017

I can start up sbt 0.13.16-M1 on 1.0.x branch of scala-parser-combinators, so I'm wondering if the problem was actually to do with AutoPlugin ordering that @dwijnand fixed in scala/sbt-scala-module#20. Will scala/scala-parser-combinators@6cac8c3 be forward ported?

@eed3si9n
Copy link
Member

eed3si9n commented May 7, 2017

Actually the forward porting was already done 5 days ago in scala/scala-parser-combinators#115, so it should build now.

@SethTisue
Copy link
Member Author

@SethTisue
Copy link
Member Author

[info] >>> The dbuild result is------------: SUCCESS (project rebuilt ok)

@eed3si9n
Copy link
Member

eed3si9n commented May 9, 2017

Awesome.

@SethTisue SethTisue changed the title WIP: upgrade to sbt 0.13.16-M1 WIP: upgrade to sbt 0.13.16 Jul 24, 2017
@SethTisue SethTisue self-assigned this Jul 24, 2017
@SethTisue
Copy link
Member Author

SethTisue commented Jul 24, 2017

test run with 0.13.6-RC1: https://scala-ci.typesafe.com/job/scala-2.12.x-integrate-community-build/1689/consoleFull (404 while Jenkins sits and ponders why the little birds flit from branch to branch, couldn't they just sit still?)

UPDATE: doh, I should have merged 2.12.x onto this branch before running

@SethTisue
Copy link
Member Author

SethTisue commented Jul 24, 2017

new test run: https://scala-ci.typesafe.com/job/scala-2.12.x-integrate-community-build/1690/consoleFull (404 while Jenkins gazes blankly at Warren Harding's deathbed)

long live the new flesh
@SethTisue SethTisue changed the title WIP: upgrade to sbt 0.13.16 upgrade to sbt 0.13.16 + misc other changes Jul 24, 2017
@SethTisue
Copy link
Member Author

I think I'm going to merge this even though 0.13.16 is still in release candidates, since it enables building the master branch of MiMa (now that Scala 2.12 support in that repo was merged), which is a pretty nice benefit.

@SethTisue
Copy link
Member Author

SethTisue commented Jul 25, 2017

sure is dark down here in this rabbit hole

but the bunnies are friendly.... SO FAR

@SethTisue
Copy link
Member Author

the scalafmt part of this is turning out to be especially hard, so I'll make a separate PR out of that

@SethTisue
Copy link
Member Author

ok I think this is done, but we need a full test run to make sure nothing regressed: https://scala-ci.typesafe.com/job/scala-2.12.x-integrate-community-build/1696/consoleFull

@SethTisue SethTisue changed the title upgrade to sbt 0.13.16 + misc other changes upgrade to sbt 0.13.16 + refresh MiMA + reinstate conductr-lib + add scalastyle + refresh lightbend-emoji Jul 25, 2017
This was referenced Jul 25, 2017
@SethTisue SethTisue merged commit 08c6c1e into scala:2.12.x Jul 25, 2017
@SethTisue SethTisue deleted the sbt-0.13.16 branch July 25, 2017 17:44
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.

4 participants