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

sbt-dotty: the binary version is 3 for Scala >= 3.0.0 #11952

Merged
merged 4 commits into from
Apr 13, 2021

Conversation

smarter
Copy link
Member

@smarter smarter commented Mar 30, 2021

No description provided.

Copy link
Member

@adpi2 adpi2 left a comment

Choose a reason for hiding this comment

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

Looks good but some tests are failing.

@smarter
Copy link
Member Author

smarter commented Mar 31, 2021

sbt is broken because of sbt/sbt#6422 (which we could work around), mill is broken because of com-lihaoyi/mill#1139

@smarter smarter mentioned this pull request Apr 6, 2021
34 tasks
@adpi2
Copy link
Member

adpi2 commented Apr 11, 2021

@adpi2 adpi2 force-pushed the fix-scalaBinaryVersion branch 5 times, most recently from ea38615 to 8719857 Compare April 12, 2021 13:05
The scripted source-dependencies/value-class is failing
for an unknown reason. I can reproduce the bug with sbt-dotty but I
cannot reproduce it without sbt-dotty. So I think it is not worth
trying to fix it.
@adpi2 adpi2 force-pushed the fix-scalaBinaryVersion branch 2 times, most recently from 9f2e2fd to 9c457b4 Compare April 12, 2021 18:10
@adpi2
Copy link
Member

adpi2 commented Apr 13, 2021

@smarter could you review this?

@smarter
Copy link
Member Author

smarter commented Apr 13, 2021

Instead of updating DEFAULT_MILL_VERSION in each submodule, could we set MILL_VERSION in the community build runner itself? (this seems like a good idea in general, in the same way that we use a single sbt version for the whole community build). I haven't checked but a change like this should work:

diff --git community-build/src/scala/dotty/communitybuild/projects.scala community-build/src/scala/dotty/communitybuild/projects.scala
index 755f774449f..c32a3ed6839 100644
--- community-build/src/scala/dotty/communitybuild/projects.scala
+++ community-build/src/scala/dotty/communitybuild/projects.scala
@@ -25,6 +25,7 @@ def exec(projectDir: Path, binary: String, arguments: String*): Int =
   val command = binary +: arguments
   log(command.mkString(" "))
   val builder = new ProcessBuilder(command: _*).directory(projectDir.toFile).inheritIO()
+  builder.environment.put("MILL_VERSION", "0.9.6-16-a5da34")
   val process = builder.start()
   val exitCode = process.waitFor()
   exitCode

Copy link
Member Author

@smarter smarter left a comment

Choose a reason for hiding this comment

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

Thanks for the help!

@adpi2 adpi2 enabled auto-merge April 13, 2021 14:21
@adpi2 adpi2 merged commit f3edd3f into scala:master Apr 13, 2021
@adpi2 adpi2 deleted the fix-scalaBinaryVersion branch April 13, 2021 15:43
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