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

Update scalacache, enable build on Scala 3 #400

Merged
merged 2 commits into from
Sep 5, 2021
Merged

Update scalacache, enable build on Scala 3 #400

merged 2 commits into from
Sep 5, 2021

Conversation

kubukoz
Copy link
Owner

@kubukoz kubukoz commented Sep 4, 2021

This may take a while to get green as Scalacache 1.0.0-M4 is only being published to Maven Central right now. I'll update to 1.0.0-M3 first in another PR.

@kubukoz
Copy link
Owner Author

kubukoz commented Sep 5, 2021

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Sep 5, 2021

Command rebase: failure

Base branch update has failed
Git reported the following error:

Rebasing (1/1)

error: could not apply e312a56... Update scalacache, enable build on Scala 3

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply e312a56... Update scalacache, enable build on Scala 3
Auto-merging build.sbt
CONFLICT (content): Merge conflict in build.sbt


err-code: A806E

@kubukoz
Copy link
Owner Author

kubukoz commented Sep 5, 2021

fine I'll do it myself

@kubukoz kubukoz merged commit e869be1 into main Sep 5, 2021
@kubukoz kubukoz deleted the bump-scalacache branch September 5, 2021 16:26
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.

1 participant