Skip to content

Commit ca66e1d

Browse files
authored
Merge pull request #1729 from bjaglin/scala211
drop support for Scala 2.11
2 parents a8789ee + 366db89 commit ca66e1d

File tree

39 files changed

+40
-366
lines changed

39 files changed

+40
-366
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
command:
15-
- "ci-211"
1615
- "ci-212"
1716
- "ci-213"
1817
- "ci-3"
@@ -40,7 +39,7 @@ jobs:
4039
- run: sbt ci-213
4140

4241
jdk17_213:
43-
name: JDK117/scala_2.13 tests
42+
name: JDK17/scala_2.13 tests
4443
runs-on: ubuntu-latest
4544
steps:
4645
- uses: actions/checkout@v3

bin/test-release.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@ version=$1
55

66
cs resolve \
77
ch.epfl.scala:scalafix-interfaces:$version \
8-
ch.epfl.scala:scalafix-core_2.11:$version \
98
ch.epfl.scala:scalafix-core_2.12:$version \
109
ch.epfl.scala:scalafix-core_2.13:$version \
11-
ch.epfl.scala:scalafix-reflect_2.11.12:$version \
1210
ch.epfl.scala:scalafix-reflect_2.12.17:$version \
1311
ch.epfl.scala:scalafix-reflect_2.13.10:$version \
14-
ch.epfl.scala:scalafix-cli_2.11.12:$version \
1512
ch.epfl.scala:scalafix-cli_2.12.17:$version \
1613
ch.epfl.scala:scalafix-cli_2.13.10:$version \
17-
ch.epfl.scala:scalafix-testkit_2.11.12:$version \
1814
ch.epfl.scala:scalafix-testkit_2.12.17:$version \
1915
ch.epfl.scala:scalafix-testkit_2.13.10:$version \
2016
-r sonatype:public

build.sbt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ lazy val interfaces = projectMatrix
3535
props.put("scalametaVersion", scalametaV)
3636
props.put("scala213", scala213)
3737
props.put("scala212", scala212)
38-
props.put("scala211", scala211)
3938
val out =
4039
(Compile / managedResourceDirectories).value.head /
4140
"scalafix-interfaces.properties"
@@ -78,10 +77,7 @@ lazy val core = projectMatrix
7877
)
7978
}
8079
},
81-
libraryDependencies += {
82-
if (isScala211.value) metaconfigFor211
83-
else metaconfig
84-
}
80+
libraryDependencies += metaconfig
8581
)
8682
.defaultAxes(VirtualAxis.jvm)
8783
.jvmPlatform(buildScalaVersions)
@@ -148,7 +144,7 @@ lazy val cli = projectMatrix
148144
Seq()
149145
},
150146
libraryDependencies ++= {
151-
if (isScala211.value || isScala3.value) Seq()
147+
if (isScala3.value) Seq()
152148
else
153149
Seq(
154150
// metaconfig 0.10.0 shaded pprint but rules built with an old
@@ -361,11 +357,6 @@ lazy val unit = projectMatrix
361357
axisValues = Seq(TargetAxis(scala212)),
362358
settings = Seq()
363359
)
364-
.jvmPlatform(
365-
scalaVersions = Seq(scala211),
366-
axisValues = Seq(TargetAxis(scala211)),
367-
settings = Seq()
368-
)
369360
.enablePlugins(BuildInfoPlugin)
370361
.dependsOn(testkit)
371362

@@ -378,8 +369,7 @@ lazy val docs = projectMatrix
378369
scalacOptions += "-Wconf:msg='match may not be exhaustive':s", // silence exhaustive pattern matching warning for documentation
379370
scalacOptions += "-Xfatal-warnings",
380371
mdoc := (Compile / run).evaluated,
381-
libraryDependencies += (if (isScala211.value) metaconfigDocFor211
382-
else metaconfigDoc)
372+
libraryDependencies += metaconfigDoc
383373
)
384374
.defaultAxes(VirtualAxis.jvm)
385375
.jvmPlatform(scalaVersions = Seq(scala213))

docs/developers/cross-publish-custom-rules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ For most rules, this change requires only modifying the build settings as follow
1717
```diff
1818
// build.sbt
1919
scalaVersion := V.scala212,
20-
+crossScalaVersions := List(V.scala213, V.scala212, V.scala211),
20+
+crossScalaVersions := List(V.scala213, V.scala212),
2121
```
2222
The second step is to update your CI to run tests on the different
2323
scala versions your rule is being cross-published to. For that, you only

docs/developers/setup.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ that is either supported by
100100
[SemanticDB](https://scalameta.org/docs/semanticdb/specification.html) compiler
101101
plugin or built-in in the compiler. Supported Scala compiler versions include:
102102

103-
- Scala @SCALA211@
104103
- Scala @SCALA212@
105104
- Scala @SCALA213@
106105
- Scala 3.x

docs/rules/ExplicitResultTypes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: ExplicitResultTypes
55
---
66

77
This rewrite inserts type annotations for inferred public members. Only compatible with
8-
scala 2.11, 2.12 & 2.13.
8+
scala 2.12 & 2.13.
99

1010
Example:
1111

docs/rules/NoAutoTupling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Adds explicit tuples around argument lists where auto-tupling is occurring.
88

99
To use this rule:
1010

11-
- enable `-Ywarn-adapted-args` for Scala 2.11 and 2.12 (note, `-Yno-adapted-args` will fail compilation,
11+
- enable `-Ywarn-adapted-args` for Scala 2.12 (note, `-Yno-adapted-args` will fail compilation,
1212
which prevents scalafix from running). For Scala 2.13, use instead `-Xlint:adapted-args`.
1313
- enable also `-deprecation` to get warnings on insertions of `Unit`.
1414

docs/rules/RemoveUnused.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ object Main {
6767
}
6868
```
6969

70-
Remove unused pattern match variables (Scala 2.12 & 2.13 only):
70+
Remove unused pattern match variables:
7171

7272
```scala
7373
case class AB(a: Int, b: String)
@@ -87,7 +87,7 @@ object Main {
8787
}
8888
```
8989

90-
Remove unused function parameters (Scala 2.12 & 2.13 only):
90+
Remove unused function parameters:
9191

9292
```scala
9393
// before
@@ -134,8 +134,6 @@ println(scalafix.website.rule("RemoveUnused", RemoveUnusedConfig.default))
134134
Consult `scala -Y` in the command-line for more information about using
135135
`-Ywarn-unused`.
136136

137-
For Scala @SCALA212@ & @SCALA213@
138-
139137
```
140138
$ scala -Ywarn-unused:help
141139
Enable or disable specific `unused' warnings
@@ -148,12 +146,4 @@ Enable or disable specific `unused' warnings
148146
params Enable -Ywarn-unused:explicits,implicits.
149147
linted -Xlint:unused.
150148
Default: All choices are enabled by default.
151-
```
152-
153-
For Scala @SCALA211@
154-
155-
```
156-
$ scala -Y | grep warn-unused
157-
-Ywarn-unused Warn when local and private vals, vars, defs, and types are unused.
158-
-Ywarn-unused-import Warn when imports are unused.
159-
```
149+
```

docs/users/installation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pull request is tested on both Linux and Windows.
1010

1111
**Java 8 or Java 11.**
1212

13-
**Scala 2.11, 2.12 or 2.13**
13+
**Scala 2.12 and 2.13**
1414

1515
**Scala 3.x**: Scala 3 support is experimental and many built-in rules are not
1616
supported.
@@ -79,7 +79,7 @@ the Scala compiler option `-Ywarn-unused-import` (or `-Wunused:imports` in
7979
*/
8080
inThisBuild(
8181
List(
82-
scalaVersion := "@SCALA212@", // @SCALA211@, @SCALA213@, or 3.x
82+
scalaVersion := "@SCALA212@", // @SCALA213@, or 3.x
8383
+ semanticdbEnabled := true, // enable SemanticDB
8484
+ semanticdbVersion := scalafixSemanticdb.revision // only required for Scala 2.x
8585
)
@@ -97,7 +97,7 @@ the Scala compiler option `-Ywarn-unused-import` (or `-Wunused:imports` in
9797
* https://www.scala-sbt.org/1.x/docs/sbt-1.3-Release-Notes.html#SemanticDB+support
9898
*/
9999
lazy val myproject = project.settings(
100-
scalaVersion := "@SCALA212@", // @SCALA211@, @SCALA213@, or 3.x
100+
scalaVersion := "@SCALA212@", // @SCALA213@, or 3.x
101101
+ semanticdbEnabled := true, // enable SemanticDB
102102
+ semanticdbVersion := scalafixSemanticdb.revision, // only required for Scala 2.x
103103
+ scalacOptions += "-Ywarn-unused-import" // Scala 2.x only, required by `RemoveUnused`

project/Dependencies.scala

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ import scala.util.Try
77
/* scalafmt: { maxColumn = 120 }*/
88

99
object Dependencies {
10-
val scala211 = "2.11.12"
1110
val scala212 = "2.12.17"
1211
val scala213 = "2.13.10"
1312
val scala3 = "3.2.1"
1413

15-
val buildScalaVersions = Seq(scala211, scala212, scala213, scala3)
16-
val testTargetScalaVersions = Seq(scala211, scala212, scala213, scala3)
14+
val buildScalaVersions = Seq(scala212, scala213, scala3)
15+
val testTargetScalaVersions = Seq(scala212, scala213, scala3)
1716

1817
// we support 3 last binary versions of scala212 and scala213
1918
val testedPreviousScalaVersions: Map[String, List[String]] =
@@ -27,12 +26,10 @@ object Dependencies {
2726
val googleDiffV = "1.3.0"
2827
val java8CompatV = "0.9.1"
2928
val jgitV = "5.13.1.202206130422-r"
30-
val metaconfigFor211V = "0.9.10" // metaconfig stops publishing for scala 2.11
3129
val metaconfigV = "0.11.1"
3230
val pprintV = "0.6.6" // don't bump, rules built against metaconfig 0.9.15 or earlier would not link
3331
val nailgunV = "0.9.1"
3432
val scalaXmlV = "2.1.0"
35-
val scalaXml211V = "1.3.0" // scala-xml stops publishing for scala 2.11
3633
val scalametaV = "4.6.0"
3734
val scalatestMinV = "3.0.8" // don't bump, to avoid forcing breaking changes on clients via eviction
3835
val scalatestLatestV = "3.2.13"
@@ -47,15 +44,12 @@ object Dependencies {
4744
val googleDiff = "com.googlecode.java-diff-utils" % "diffutils" % googleDiffV
4845
val java8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % java8CompatV
4946
val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % jgitV
50-
val metaconfigFor211 = "com.geirsson" %% "metaconfig-typesafe-config" % metaconfigFor211V
5147
val metaconfig = "com.geirsson" %% "metaconfig-typesafe-config" % metaconfigV
5248
val pprint = "com.lihaoyi" %% "pprint" % pprintV
53-
val metaconfigDocFor211 = "com.geirsson" %% "metaconfig-docs" % metaconfigFor211V
5449
val metaconfigDoc = "com.geirsson" %% "metaconfig-docs" % metaconfigV
5550
val metacp = "org.scalameta" %% "metacp" % scalametaV
5651
val nailgunServer = "com.martiansoftware" % "nailgun-server" % nailgunV
5752
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % scalaXmlV
58-
val scalaXml211 = "org.scala-lang.modules" %% "scala-xml" % scalaXml211V
5953
// https://github.com/scalameta/scalameta/issues/2485
6054
val scalameta = ("org.scalameta" %% "scalameta" % scalametaV)
6155
.cross(CrossVersion.for3Use2_13)

0 commit comments

Comments
 (0)