Skip to content

Commit 3a9b030

Browse files
committed
Follow up on scala3doc rename
Ref sbt/sbt#6307 Ref scala/scala3#11289
1 parent 7b45fc5 commit 3a9b030

File tree

1 file changed

+22
-5
lines changed

1 file changed

+22
-5
lines changed

core/src/main/scala/sbt/librarymanagement/ScalaArtifacts.scala

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,37 @@ object ScalaArtifacts {
1313
final val Scala3CompilerID = "scala3-compiler"
1414
final val Scala3InterfacesID = "scala3-interfaces"
1515
final val TastyCoreID = "tasty-core"
16+
final val ScaladocID = "scaladoc"
1617
final val Scala3DocID = "scala3doc"
1718
final val Scala3TastyInspectorID = "scala3-tasty-inspector"
1819

1920
private[sbt] final val Scala3LibraryPrefix = Scala3LibraryID + "_"
2021
private[sbt] final val Scala3CompilerPrefix = Scala3CompilerID + "_"
2122
private[sbt] final val TastyCorePrefix = TastyCoreID + "_"
23+
private[sbt] final val ScaladocPrefix = ScaladocID + "_"
2224
private[sbt] final val Scala3DocPrefix = Scala3DocID + "_"
2325
private[sbt] final val Scala3TastyInspectorPrefix = Scala3TastyInspectorID + "_"
2426

2527
def isScala2Artifact(name: String): Boolean = {
2628
name == LibraryID || name == CompilerID || name == ReflectID || name == ActorsID || name == ScalapID
2729
}
2830
def isScala3Artifact(name: String): Boolean = {
29-
name.startsWith(Scala3LibraryPrefix) || name.startsWith(Scala3CompilerPrefix) ||
30-
name.startsWith(TastyCorePrefix) || name == Scala3InterfacesID ||
31-
name.startsWith(Scala3DocPrefix) || name.startsWith(Scala3TastyInspectorPrefix)
31+
name.startsWith(Scala3LibraryPrefix) ||
32+
name.startsWith(Scala3CompilerPrefix) ||
33+
name.startsWith(TastyCorePrefix) ||
34+
name == Scala3InterfacesID ||
35+
name.startsWith(ScaladocPrefix) ||
36+
name.startsWith(Scala3DocPrefix) ||
37+
name.startsWith(Scala3TastyInspectorPrefix)
3238
}
3339

3440
def isScala3(scalaVersion: String): Boolean = scalaVersion.startsWith("3.")
3541

42+
private[sbt] def isScala3M123(scalaVersion: String): Boolean =
43+
(scalaVersion == "3.0.0-M1") ||
44+
(scalaVersion == "3.0.0-M2") ||
45+
(scalaVersion == "3.0.0-M3")
46+
3647
def libraryIds(version: String): Array[String] = {
3748
if (isScala3(version))
3849
Array(Scala3LibraryID, LibraryID)
@@ -57,13 +68,19 @@ object ScalaArtifacts {
5768
org: String,
5869
version: String
5970
): Seq[ModuleID] =
60-
if (isScala3(version)) {
71+
if (isScala3M123(version))
6172
Seq(
6273
ModuleID(org, Scala3DocID, version)
6374
.withConfigurations(Some(Configurations.ScalaDocTool.name + "->default(compile)"))
6475
.withCrossVersion(CrossVersion.binary)
6576
)
66-
} else Seq.empty
77+
else if (isScala3(version))
78+
Seq(
79+
ModuleID(org, ScaladocID, version)
80+
.withConfigurations(Some(Configurations.ScalaDocTool.name + "->default(compile)"))
81+
.withCrossVersion(CrossVersion.binary)
82+
)
83+
else Seq.empty
6784

6885
private[sbt] def toolDependencies(
6986
org: String,

0 commit comments

Comments
 (0)