@@ -13,26 +13,37 @@ object ScalaArtifacts {
13
13
final val Scala3CompilerID = " scala3-compiler"
14
14
final val Scala3InterfacesID = " scala3-interfaces"
15
15
final val TastyCoreID = " tasty-core"
16
+ final val ScaladocID = " scaladoc"
16
17
final val Scala3DocID = " scala3doc"
17
18
final val Scala3TastyInspectorID = " scala3-tasty-inspector"
18
19
19
20
private [sbt] final val Scala3LibraryPrefix = Scala3LibraryID + " _"
20
21
private [sbt] final val Scala3CompilerPrefix = Scala3CompilerID + " _"
21
22
private [sbt] final val TastyCorePrefix = TastyCoreID + " _"
23
+ private [sbt] final val ScaladocPrefix = ScaladocID + " _"
22
24
private [sbt] final val Scala3DocPrefix = Scala3DocID + " _"
23
25
private [sbt] final val Scala3TastyInspectorPrefix = Scala3TastyInspectorID + " _"
24
26
25
27
def isScala2Artifact (name : String ): Boolean = {
26
28
name == LibraryID || name == CompilerID || name == ReflectID || name == ActorsID || name == ScalapID
27
29
}
28
30
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 )
32
38
}
33
39
34
40
def isScala3 (scalaVersion : String ): Boolean = scalaVersion.startsWith(" 3." )
35
41
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
+
36
47
def libraryIds (version : String ): Array [String ] = {
37
48
if (isScala3(version))
38
49
Array (Scala3LibraryID , LibraryID )
@@ -57,13 +68,19 @@ object ScalaArtifacts {
57
68
org : String ,
58
69
version : String
59
70
): Seq [ModuleID ] =
60
- if (isScala3 (version)) {
71
+ if (isScala3M123 (version))
61
72
Seq (
62
73
ModuleID (org, Scala3DocID , version)
63
74
.withConfigurations(Some (Configurations .ScalaDocTool .name + " ->default(compile)" ))
64
75
.withCrossVersion(CrossVersion .binary)
65
76
)
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
67
84
68
85
private [sbt] def toolDependencies (
69
86
org : String ,
0 commit comments