Skip to content

Migrate to sbt 1.0.0-M6#316

Closed
jvican wants to merge 4 commits intosbt:1.0from
scalacenter:sbt-1.0.0
Closed

Migrate to sbt 1.0.0-M6#316
jvican wants to merge 4 commits intosbt:1.0from
scalacenter:sbt-1.0.0

Conversation

@jvican
Copy link
Member

@jvican jvican commented Jun 14, 2017 •
edited
Loading

Dogfooding ourselves.

@jvican jvican changed the title Speed up CI by 7x Migrate to sbt 1.0.0-M6 Jun 14, 2017
@jvican
Copy link
Member Author

jvican commented Jun 14, 2017 •
edited
Loading

Things blocking this PR:

  • sbt-jmh
  • neo-sbt-scalafmt

@jvican jvican force-pushed the sbt-1.0.0 branch 2 times, most recently from e9d806b to 09c789d Compare June 14, 2017 14:33
@jvican
Copy link
Member Author

jvican commented Jun 14, 2017

This PR depends on #315. It cannot be merged after that has landed. CI is not passing because we still require the aforementioned sbt plugins. I published locally for both and worked.

We need to wait to merge this until we have the scripted and test log improvements in a release.

@jvican jvican mentioned this pull request Jun 14, 2017
Merged
@eed3si9n
Copy link
Member

eed3si9n commented Jun 27, 2017

I would like to get emulated monorepo working on my machine again, and I am currently blocked on Zinc not having the same sbt version.

@jvican jvican mentioned this pull request Jun 27, 2017
Closed
@jvican
Copy link
Member Author

jvican commented Jun 27, 2017

@eed3si9n Honestly, I'm not happy to merge sbt 1.0.x support until we don't have the logging improvements that make test logs intelligible. Is it possible to release a bincompat M6-2 and we depend on it?

@jvican
Copy link
Member Author

jvican commented Jun 27, 2017

By the way, PR has been updated and sbt 1.0 works. Old scalafmt plugin has been removed in favor of the thoroughly-tested sbt-neo-scalafmt.

dwijnand
dwijnand reviewed Jun 27, 2017
View reviewed changes
build.sbt Outdated

def addBaseSettingsAndTestDeps(p: Project): Project =
p.settings(baseSettings).configure(addTestDependencies)
p.settings(baseSettings).configure(addTestDependencies _)
Copy link
Member

@dwijnand dwijnand Jun 27, 2017

Choose a reason for hiding this comment

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

By-the-by, I'm pretty sure the underscores aren't required here and throughout. I think I know what happened: if you make a mistake, like forget a comma, the scala compiler is eager to tell how you should be explicitly eta-expanding these, but the error is actually elsewhere (i.e the missing comma).

Copy link
Member Author

@jvican jvican Jun 27, 2017

Choose a reason for hiding this comment

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

Thanks for the heads up Dale, I didn't know this and yeah, it's probably what happened. I've just updated the PR. It's a shame scalac behaves this way, hope this changes.

@eed3si9n
Copy link
Member

eed3si9n commented Jun 27, 2017 

[error] (zinc/compile:scalafmt::test) java.lang.NoSuchMethodError: com.lucidchart.scalafmt.api.Scalafmtter.formatter(Lcom/lucidchart/scalafmt/api/Dialect;)Ljava/util/function/Function;
101s
289
[error] (zinc/compile:scalafmt::sources) java.lang.NoSuchMethodError: com.lucidchart.scalafmt.api.Scalafmtter.includeFile(Ljava/nio/file/Path;)Z
101s
290
[error] (zinc/compile:scalafmt::sources) java.lang.NoSuchMethodError: com.lucidchart.scalafmt.api.Scalafmtter.includeFile(Ljava/nio/file/Path;)Z
101s
291
[error] (zincCompile/compile:scalafmt::test) java.lang.NoSuchMethodError:

Could we first pick the same addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.3") that's been working for other modules, and add improvements in a separate PR?

@eed3si9n eed3si9n mentioned this pull request Jun 28, 2017
Merged
@jvican
Copy link
Member Author

jvican commented Jun 30, 2017

Closing in favor of #323.

@jvican jvican closed this Jun 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dwijnand dwijnand dwijnand left review comments

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

@jvican @eed3si9n @dwijnand