Skip to content

[2.9.x] Upgrade sbt-web plugins (to avoid repo.scala-sbt.org) (backport #12340) by @mkurz#12345

Merged
mergify[bot] merged 1 commit into2.9.xfrom
mergify/bp/2.9.x/pr-12340
Jan 30, 2024
Merged

[2.9.x] Upgrade sbt-web plugins (to avoid repo.scala-sbt.org) (backport #12340) by @mkurz#12345
mergify[bot] merged 1 commit into2.9.xfrom
mergify/bp/2.9.x/pr-12340

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2024

This is an automatic backport of pull request #12340 done by Mergify.
Cherry-pick of 96e2898 has failed:

On branch mergify/bp/2.9.x/pr-12340
Your branch is up to date with 'origin/2.9.x'.

You are currently cherry-picking commit 96e28989f2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   documentation/manual/working/commonGuide/assets/AssetsCoffeeScript.md
	modified:   documentation/manual/working/commonGuide/assets/AssetsJSHint.md
	modified:   documentation/manual/working/commonGuide/assets/AssetsLess.md
	modified:   documentation/manual/working/commonGuide/assets/RequireJS-support.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/dev-mode/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/disabled-assets-jar/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject-assets/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-namespace-reverse-router/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/project/plugins.sbt
	both modified:   dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/project/plugins.sbt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 96e2898)

# Conflicts:
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/dev-mode/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/disabled-assets-jar/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject-assets/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-namespace-reverse-router/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/project/plugins.sbt
#	dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/project/plugins.sbt
@mergify mergify bot merged commit 2e4dd2d into 2.9.x Jan 30, 2024
@mergify mergify bot deleted the mergify/bp/2.9.x/pr-12340 branch January 30, 2024 12:17
@ihostage ihostage added this to the 2.9.2 / 3.0.2 milestone Jan 30, 2024
@mkurz mkurz modified the milestones: 3.0.2, 2.9.2 Feb 27, 2024
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.

2 participants