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

Add support for Scala 3 3.0.0-M2 #2260

Merged
merged 1 commit into from
Nov 25, 2020

Conversation

tgodzik
Copy link
Contributor

@tgodzik tgodzik commented Nov 25, 2020

No description provided.

@tgodzik tgodzik requested a review from ckipp01 November 25, 2020 16:29
@@ -214,7 +214,7 @@ lazy val V = new {
def scala2Versions = nonDeprecatedScala2Versions ++ deprecatedScala2Versions

// Scala 3
def nonDeprecatedScala3Versions = Seq(scala3, "0.27.0-RC1")
def nonDeprecatedScala3Versions = Seq(scala3, "3.0.0-M1", "0.27.0-RC1")
Copy link
Member

Choose a reason for hiding this comment

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

Just because I don't fully remember where we ended up on this. How long will we keep 0.27.0-RC1 around as non-deprecated?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Probably under the end of the course at EPFL.

Comment on lines +187 to +189
if (scalaVersion == "0.27.0-RC1") "2.2.10"
else if (scalaVersion == "3.0.0-M1") "2.2.12"
else BuildInfo.mdocVersion
Copy link
Member

Choose a reason for hiding this comment

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

I honestly don't love that we are doing this. Was it just not possible to publish mdoc for both M1 and M2? It seems a bit extreme that have to have logic to include 1 of 3 different versions of a single dependency.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It seemed simpler to just put in the logic here. We need to double the code for each Scala 3 version currently and it's really only Metals doing it. I might have been too quick, but there was no real changes between all those changes that would impact worksheets.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After the changes in scala/scala3#10172 we should be able to just do scalameta/mdoc@81e43c1

Copy link
Member

@ckipp01 ckipp01 left a comment

Choose a reason for hiding this comment

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

LGTM

@tgodzik tgodzik force-pushed the add-support-for-3.0.0-M2 branch from 3d3075e to bad2ebd Compare November 25, 2020 17:26
@tgodzik tgodzik merged commit decabc3 into scalameta:main Nov 25, 2020
@tgodzik tgodzik deleted the add-support-for-3.0.0-M2 branch November 25, 2020 18:15
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