Skip to content

Default to Scala3doc #10762

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

Merged
merged 1 commit into from
Dec 13, 2020
Merged

Conversation

abgruszecki
Copy link
Contributor

@abgruszecki abgruszecki commented Dec 12, 2020

Default to useScala3doc := true.

We should leave it there for now I guess for compat reasons.

@abgruszecki abgruszecki marked this pull request as ready for review December 12, 2020 17:31
@@ -362,7 +362,7 @@ object DottyPlugin extends AutoPlugin {

// Configuration for the doctool
resolvers ++= (if(!useScala3doc.value) Nil else Seq(Resolver.jcenterRepo)),
useScala3doc := false,
useScala3doc := VersionNumber(scalaVersion.value).matchesSemVer(SemanticSelector(">=3.0.0-M3")),
Copy link
Member

Choose a reason for hiding this comment

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

Note that I haven't checked if the current version number is considered >= 3.0.0-M3

@abgruszecki
Copy link
Contributor Author

Alright, hold off on the reviews, I'll work on this tomorrow. We also need to check if we still can publish Dotty itself locally, I guess.

smarter added a commit to dotty-staging/dotty that referenced this pull request Dec 13, 2020
Because we're building sbt-dotty using sbt 1.4, we cannot guarantee that
it works with older sbt versions (and in fact it doesn't), since this is
a compatibility, we also bump the version number of sbt-dotty.

Waiting for scala#10762 to be merged before releasing sbt-dotty 0.5.0.
@smarter smarter added this to the 3.0.0-M3 milestone Dec 13, 2020
@abgruszecki abgruszecki requested a review from smarter December 13, 2020 15:54
useScala3doc := false,
useScala3doc := {
val v = scalaVersion.value
v.startsWith("3.0.0") && !v.startsWith("3.0.0-M1") && !v.startsWith("3.0.0-M2")
Copy link
Member

Choose a reason for hiding this comment

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

More future-proof:

Suggested change
v.startsWith("3.0.0") && !v.startsWith("3.0.0-M1") && !v.startsWith("3.0.0-M2")
v.startsWith("3") && !v.startsWith("3.0.0-M1") && !v.startsWith("3.0.0-M2")

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This setting is going to disappear with 3.0.0, there's no need for this.

@abgruszecki abgruszecki merged commit 3c18f6b into scala:master Dec 13, 2020
@abgruszecki abgruszecki deleted the default-to-scala3doc branch December 13, 2020 17:10
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.

3 participants