luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #365 from eed3si9n/wip/rename 

Follow up on scala3doc rename
This commit is contained in:
eugene yokota 2021-02-14 13:37:47 -05:00 committed by GitHub
parent 99641bb552 3a9b0303f8
commit 70e7718353
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/main/scala/sbt/librarymanagement/ScalaArtifacts.scala
View File

@ -13,12 +13,14 @@ object ScalaArtifacts {
final val Scala3CompilerID = "scala3-compiler"
final val Scala3InterfacesID = "scala3-interfaces"
final val TastyCoreID = "tasty-core"
final val ScaladocID = "scaladoc"
final val Scala3DocID = "scala3doc"
final val Scala3TastyInspectorID = "scala3-tasty-inspector"
private[sbt] final val Scala3LibraryPrefix = Scala3LibraryID + "_"
private[sbt] final val Scala3CompilerPrefix = Scala3CompilerID + "_"
private[sbt] final val TastyCorePrefix = TastyCoreID + "_"
private[sbt] final val ScaladocPrefix = ScaladocID + "_"
private[sbt] final val Scala3DocPrefix = Scala3DocID + "_"
private[sbt] final val Scala3TastyInspectorPrefix = Scala3TastyInspectorID + "_"
@ -26,13 +28,22 @@ object ScalaArtifacts {
name == LibraryID || name == CompilerID || name == ReflectID || name == ActorsID || name == ScalapID
}
def isScala3Artifact(name: String): Boolean = {
name.startsWith(Scala3LibraryPrefix) || name.startsWith(Scala3CompilerPrefix) ||
name.startsWith(TastyCorePrefix) || name == Scala3InterfacesID ||
name.startsWith(Scala3DocPrefix) || name.startsWith(Scala3TastyInspectorPrefix)
name.startsWith(Scala3LibraryPrefix) ||
name.startsWith(Scala3CompilerPrefix) ||
name.startsWith(TastyCorePrefix) ||
name == Scala3InterfacesID ||
name.startsWith(ScaladocPrefix) ||
name.startsWith(Scala3DocPrefix) ||
name.startsWith(Scala3TastyInspectorPrefix)
}
def isScala3(scalaVersion: String): Boolean = scalaVersion.startsWith("3.")
private[sbt] def isScala3M123(scalaVersion: String): Boolean =
(scalaVersion == "3.0.0-M1") ||
(scalaVersion == "3.0.0-M2") ||
(scalaVersion == "3.0.0-M3")
def libraryIds(version: String): Array[String] = {
if (isScala3(version))
Array(Scala3LibraryID, LibraryID)
@ -57,13 +68,19 @@ object ScalaArtifacts {
org: String,
version: String
): Seq[ModuleID] =
if (isScala3(version)) {
if (isScala3M123(version))
Seq(
ModuleID(org, Scala3DocID, version)
.withConfigurations(Some(Configurations.ScalaDocTool.name + "->default(compile)"))
.withCrossVersion(CrossVersion.binary)
)
} else Seq.empty
else if (isScala3(version))
Seq(
ModuleID(org, ScaladocID, version)
.withConfigurations(Some(Configurations.ScalaDocTool.name + "->default(compile)"))
.withCrossVersion(CrossVersion.binary)
)
else Seq.empty
private[sbt] def toolDependencies(
org: String,