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

Replace DynamicProjectAdder with sbt.AutoPlugin's extraProjects (bp #2161) #2174

Merged
merged 5 commits into from
Aug 14, 2019

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 13, 2019

This is an automated backport of pull request #2161 done by Mergify.io

Cherry-pick of 179d890 has failed:

On branch mergify/bp/1.5.x/pr-2161
Your branch is ahead of 'origin/1.5.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 179d890c1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   dev/sbt-plugin/src/main/scala/com/lightbend/lagom/sbt/LagomPlugin.scala

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

@mergify mergify bot requested a review from a team as a code owner August 13, 2019 17:21
Otherwise the "docs" build fails with "undefined settings".  I suspect
because the docs build imports the main build, and "extraProjects" gets
confused what is meant by "ThisBuild".  This, luckily, works.

(cherry picked from commit 179d890)

# Conflicts:
#	dev/sbt-plugin/src/main/scala/com/lightbend/lagom/sbt/LagomPlugin.scala
For some reason can't call "stop" at the root project. ¯\_(ツ)_/¯

    [info] [error] Not a valid command: stop (similar: set, last, lastGrep)
    [info] [error] No such setting/task
    [info] [error] stop
    [info] [error]     ^

(cherry picked from commit 62eadec)
For some reason can't call "stage" at the root project. ¯\_(ツ)_/¯

    [info] [error] Not a valid command: stage (similar: last-grep, set, last)
    [info] [error] No such setting/task
    [info] [error] stage
    [info] [error]      ^

(cherry picked from commit c1ad50a)
By declaring the root and its aggregates we workaround sbt's
extraProjects bug, which means we can revert the previous workaround of
using lagomProj/stage and playProj/stage.

(cherry picked from commit e449642)
@mergify mergify bot merged commit 7d631bf into 1.5.x Aug 14, 2019
@mergify mergify bot deleted the mergify/bp/1.5.x/pr-2161 branch August 14, 2019 10:50
@dwijnand dwijnand added this to the Lagom 1.5.2 milestone Aug 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

1 participant