We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 1fa18fb commit 40f7f5cCopy full SHA for 40f7f5c
9 files changed
build.sbt
@@ -17,8 +17,6 @@ lazy val V =
17
val moped = "0.2.0"
18
val gradle = "7.0"
19
val scala213 = "2.13.13"
20
- val scala212 = "2.12.19"
21
- val scala211 = "2.11.12"
22
val scala3 = "3.3.3"
23
val metals = "1.2.2"
24
val scalameta = "4.9.3"
@@ -138,8 +136,6 @@ lazy val gradlePlugin = project
138
136
"semanticdbVersion" -> V.scalameta,
139
137
"semanticdbKotlincVersion" -> V.semanticdbKotlin,
140
"mtagsVersion" -> V.metals,
141
- "scala211" -> V.scala211,
142
- "scala212" -> V.scala212,
143
"scala213" -> V.scala213,
144
"scala3" -> V.scala3,
145
"minimalMillVersion" -> V.minimalMillVersion,
@@ -265,8 +261,6 @@ lazy val cli = project
265
261
266
262
267
263
268
269
270
264
271
272
docs/getting-started.md
@@ -230,9 +230,8 @@ by [Metals](https://scalameta.org/metals), the Scala language server.
230
231
| Scala version | Goto definition | Find references | Hover |
232
| ------------- | --------------- | --------------- | ----- |
233
-| Scala 2.10.x | ❌ | ❌ | ❌ |
234
-| Scala 2.11.x | ✅ | ✅ | ✅ |
235
-| Scala 2.12.x | ✅ | ✅ | ✅ |
+| Scala 2.11.x | ❌ | ❌ | ❌ |
+| Scala 2.12.x | ❌ | ❌ | ❌ |
236
| Scala 2.13.x | ✅ | ✅ | ✅ |
237
| Scala 3.x | ✅ | ✅ | ❌ |
238
scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/ScalaVersion.scala
@@ -20,31 +20,19 @@ object ScalaVersion {
* 2.13.
* - We should only infer Scala versions that are supported by the
* `org.scalameta:mtags` module, which we use to compile SemanticDB files.
- * Currently, mtags supports the latest patch releases of Scala 2.11,
- * 2.12, 2.13 and Scala 3.
+ * Currently, mtags supports the latest patch releases of Scala 2.13 and
+ * Scala 3.
25
*/
26
def inferFromJar(jar: Path): Option[String] = {
27
val Scala3 = ".*_3\\b.*".r
28
- val Scala211 = ".*_2.11\\b.*".r
29
- val Scala212 = ".*_2.12\\b.*".r
30
val Scala213 = ".*_2.13\\b.*".r
31
- // The official Scala 2 distribution doesn't use the standard _2.N suffix
32
- // So we add a special case for scala-{compiler,reflect,library} and scalap.
33
val ScalaOfficial =
34
".*scala(p|-compiler|-reflect|-library)?-2.([^\\.]+).*.jar".r
35
Option(jar.getFileName.toString).collect {
36
case Scala3() =>
37
BuildInfo.scala3
38
- case Scala211() =>
39
- BuildInfo.scala211
40
- case Scala212() =>
41
- BuildInfo.scala212
42
case Scala213() =>
43
BuildInfo.scala213
44
- case ScalaOfficial(_, "11") =>
45
46
- case ScalaOfficial(_, "12") =>
47
48
case ScalaOfficial(_, "13") =>
49
50
}
tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala
@@ -341,7 +341,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
341
| mavenCentral()
342
|}
343
|dependencies {
344
- | implementation 'org.scala-lang:scala-library:2.12.12'
+ | implementation 'org.scala-lang:scala-library:2.13.13'
345
346
|/src/main/java/foo/JExample.java
347
|package foo;
@@ -358,7 +358,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
358
|""".stripMargin,
359
expectedSemanticdbFiles = 4,
360
gradleVersions = List(Gradle8, Gradle7, Gradle6),
361
- tools = List(Scala2_12_12)
+ tools = List(Scala213)
362
)
363
checkGradleBuild(
364
"kotlin2",
tests/buildTools/src/test/scala/tests/MillBuildToolSuite.scala
@@ -37,24 +37,24 @@ class MillBuildToolSuite extends BaseBuildToolSuite {
).mkString("\n")
else if (scalaVersion.startsWith("2.13"))
"maven:org.scala-lang:scala-library:2.13.8"
- else if (scalaVersion.startsWith("2.12"))
- "maven:org.scala-lang:scala-library:2.12.19"
else
- "idn fail, we don't cover this scala version"
+ throw new IllegalArgumentException(
+ s"Unsupported Scala version: $scalaVersion"
+ )
def scalaBinaryVersion(scalaVersion: String) =
if (scalaVersion.startsWith("3"))
"3"
"2.13"
51
- "2.12"
52
53
54
55
for {
56
mill <- List(Mill0_10, Mill0_11)
57
- scala <- List(Scala212, Scala2_13_8, Scala3)
+ scala <- List(Scala2_13_8, Scala3)
58
} yield {
59
60
checkBuild(
tests/buildTools/src/test/scala/tests/SbtBuildToolSuite.scala
@@ -5,7 +5,7 @@ abstract class SbtBuildToolSuite(sbt: Tool.SBT) extends BaseBuildToolSuite {
5
import Tool._
6
7
8
- scala <- List(Scala211, Scala2_12_12, Scala2_13_8, Scala3)
9
10
11
s"basic-${sbt.name}-${scala.name}",
tests/buildTools/src/test/scala/tests/ScipBuildToolSuite.scala
@@ -179,8 +179,6 @@ class ScipBuildToolSuite extends BaseBuildToolSuite {
179
180
181
List(
182
- ScalaCombination("2.11", V.scala211, V.scala211),
183
- ScalaCombination("2.12", V.scala212, V.scala212),
184
ScalaCombination("2.13", V.scala213, V.scala213),
185
// The Scala 2.13 version of the build and the Scala 2.13 version of
186
// Scala 3's standard library are not necessarily aligned
tests/buildTools/src/test/scala/tests/Tool.scala
@@ -52,10 +52,7 @@ object Tool {
extends Tool("scala", version, support)
// See https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
case object Scala213 extends Scala("2.13.13", noRestrictions)
- case object Scala212 extends Scala("2.12.19", noRestrictions)
- case object Scala2_12_12 extends Scala("2.12.12", atMostJava(11))
case object Scala2_13_8 extends Scala("2.13.8", atMostJava(17))
- case object Scala211 extends Scala("2.11.9", atMostJava(11))
case object Scala3 extends Scala("3.3.3", noRestrictions)
61
sealed abstract class Mill(version: String, support: JVMSupport)
tests/unit/src/test/scala/tests/ScalaVersionSuite.scala
@@ -22,16 +22,16 @@ class ScalaVersionSuite extends FunSuite {
checkNone("junit-4.13.2")
checkNone("scala-library-2.10.1.jar")
- check("scala-library-2.11.1.jar", V.scala211)
- check("scala-library-2.12.1.jar", V.scala212)
+ checkNone("scala-library-2.11.1.jar")
+ checkNone("scala-library-2.12.1.jar")
check("scala-compiler-2.13.1.jar", V.scala213)
check("scala-reflect-2.13.1.jar", V.scala213)
check("scala-library-2.13.1.jar", V.scala213)
check("scalap-2.13.1.jar", V.scala213)
checkNone("scala-library-2.14.1.jar")
- check("geny_2.11-0.10.5.jar", V.scala211)
- check("geny_2.12-0.10.5.jar", V.scala212)
+ checkNone("geny_2.11-0.10.5.jar")
+ checkNone("geny_2.12-0.10.5.jar")
check("geny_2.13-0.10.5.jar", V.scala213)
check("geny_3-0.10.5.jar", V.scala3)
0 commit comments