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.

Sign up for GitHub

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

Jump to bottom

Upgrade Ammonite to 2.5.0, fansi to 0.3.0, acyclic to 0.3.0 #1616

Merged
merged 3 commits into from
Dec 14, 2021
Merged

Upgrade Ammonite to 2.5.0, fansi to 0.3.0, acyclic to 0.3.0 #1616

merged 3 commits into from
Dec 14, 2021

Conversation

lihaoyi
Copy link
Member

@lihaoyi lihaoyi commented Dec 13, 2021 •
edited
Loading

Also re-enabled the acyclic plugin, manually created a dependency cycle, and verified the error was reasonable:

[info] compiling 7 Scala sources to /Users/lihaoyi/Github/mill/out/main/util/compile/dest/classes ...
[error] Unwanted cyclic dependency
[info] /Users/lihaoyi/Github/mill/main/util/src/mill/util/Jvm.scala:6:11:
[info]   val y = EitherOps
[info]           ^
[info] symbol: object EitherOps
[info] /Users/lihaoyi/Github/mill/main/util/src/mill/util/EitherOps.scala:19:11:
[info]   val x = Jvm
[info]           ^
[info] symbol: object Jvm
[error] one error found

Probably not gonna fix all the dependency cycles and re-enable the acyclic enforcement in this PR, maybe in a follow up

@lihaoyi lihaoyi mentioned this pull request Dec 13, 2021
Closed
@lefou
Copy link
Member

lefou commented Dec 13, 2021

I think, we have disabled our use of acyclic some time ago to use newer Scala versions.

@lefou
Copy link
Member

lefou commented Dec 13, 2021

I think, we have disabled our use of acyclic some time ago to use newer Scala versions.

d6dd9f6

lefou
lefou reviewed Dec 13, 2021
View reviewed changes
build.sc Outdated
val acyclic = ivy"com.lihaoyi::acyclic:0.2.0"
val ammonite = ivy"com.lihaoyi:::ammonite:2.4.1"
val ammoniteTerminal = ivy"com.lihaoyi::ammonite-terminal:2.4.1"
val acyclic = ivy"com.lihaoyi:::acyclic:0.3.0"
Copy link
Member

Choose a reason for hiding this comment

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

I guess this would fail, once used, as acyclic is now cross-compiled against the full Scala version.

Copy link
Member

Choose a reason for hiding this comment

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

We should remove the acyclic bump from this PR and handle it separately.

Copy link
Member

Choose a reason for hiding this comment

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

See #1618

@lihaoyi
Copy link
Member Author

lihaoyi commented Dec 14, 2021

@lefou I reverted the acyclic change. Last run was green, next run should be green too since we weren't actually using acyclic

lefou
lefou approved these changes Dec 14, 2021
View reviewed changes
Copy link
Member

@lefou lefou left a comment

Choose a reason for hiding this comment

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

LGTM! Test failure seem to be just a flaky run.

@lefou lefou merged commit 90704a9 into main Dec 14, 2021
@lefou lefou deleted the lols branch December 14, 2021 07:40
@lefou lefou added this to the 0.10.0-M5 milestone Dec 14, 2021
@lefou lefou mentioned this pull request Dec 14, 2021
Closed
pbuszka pushed a commit to pbuszka/mill that referenced this pull request Dec 26, 2021
@lihaoyi @pbuszka
Upgrade Ammonite to 2.5.0, fansi to 0.3.0, acyclic to 0.3.0 (com-liha…
3829c8e 
…oyi#1616)

Pull request: com-lihaoyi#1616
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lefou lefou lefou approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.10.0-M5
Development

Successfully merging this pull request may close these issues.
2 participants
@lihaoyi @lefou