Skip to content

Commit 0d366a3

Browse files
authored
Merge pull request #182 from danicheg/drop-versions
Drop support for older versions of Scala 2.12 and 2.13
2 parents fbdc381 + 06a7985 commit 0d366a3

File tree

17 files changed

+11
-154
lines changed

17 files changed

+11
-154
lines changed

.github/workflows/ci.yml

+8-22
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515
- uses: sbt/setup-sbt@v1
16-
- name: Setup Java (temurin@8)
16+
- name: Setup Java (temurin@11)
1717
uses: actions/setup-java@v4
1818
with:
1919
distribution: temurin
20-
java-version: 8
20+
java-version: 11
2121
cache: sbt
2222
- uses: coursier/cache-action@v6
2323
- name: Check formatting
@@ -28,11 +28,11 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v4
3030
- uses: sbt/setup-sbt@v1
31-
- name: Setup Java (temurin@8)
31+
- name: Setup Java (temurin@11)
3232
uses: actions/setup-java@v4
3333
with:
3434
distribution: temurin
35-
java-version: 8
35+
java-version: 11
3636
cache: sbt
3737
- uses: coursier/cache-action@v6
3838
- run: sbt docs/run
@@ -42,23 +42,9 @@ jobs:
4242
matrix:
4343
os: [ ubuntu-latest ]
4444
scala:
45-
- 2.12.13
46-
- 2.12.14
47-
- 2.12.15
48-
- 2.12.16
49-
- 2.12.17
5045
- 2.12.18
5146
- 2.12.19
5247
- 2.12.20
53-
- 2.13.5
54-
- 2.13.6
55-
- 2.13.7
56-
- 2.13.8
57-
- 2.13.9
58-
- 2.13.10
59-
- 2.13.11
60-
- 2.13.12
61-
- 2.13.13
6248
- 2.13.14
6349
- 2.13.15
6450
- 2.13.16
@@ -68,11 +54,11 @@ jobs:
6854
with:
6955
submodules: true
7056
- uses: sbt/setup-sbt@v1
71-
- name: Setup Java (temurin@8)
57+
- name: Setup Java (temurin@11)
7258
uses: actions/setup-java@v4
7359
with:
7460
distribution: temurin
75-
java-version: 8
61+
java-version: 11
7662
cache: sbt
7763
- uses: coursier/cache-action@v6
7864
- name: Compiler plugin tests
@@ -87,11 +73,11 @@ jobs:
8773
with:
8874
submodules: true
8975
- uses: sbt/setup-sbt@v1
90-
- name: Setup Java (temurin@8)
76+
- name: Setup Java (temurin@11)
9177
uses: actions/setup-java@v4
9278
with:
9379
distribution: temurin
94-
java-version: 8
80+
java-version: 11
9581
cache: sbt
9682
- uses: coursier/cache-action@v6
9783
- name: Running tests

build.sbt

+2-17
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,8 @@ lazy val root = project
2424
(integrations / watchSources).value
2525
)
2626

27-
val bin212 =
28-
Seq("2.12.20", "2.12.19", "2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13")
29-
val bin213 =
30-
Seq(
31-
"2.13.16",
32-
"2.13.15",
33-
"2.13.14",
34-
"2.13.13",
35-
"2.13.12",
36-
"2.13.11",
37-
"2.13.10",
38-
"2.13.9",
39-
"2.13.8",
40-
"2.13.7",
41-
"2.13.6",
42-
"2.13.5"
43-
)
27+
val bin212 = Seq("2.12.20", "2.12.19", "2.12.18")
28+
val bin213 = Seq("2.13.16", "2.13.15", "2.13.14")
4429

4530
// Copied from
4631
// https://github.com/scalameta/scalameta/blob/370e304b0d10db1dd65fc79a5abc1f39004aeffd/build.sbt#L724-L737

plugin/src/main/scala-2.12.13/ch/epfl/scala/profilers/tools/SettingsOps.scala

-9
This file was deleted.

plugin/src/main/scala-2.12.14/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.12.15/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.12.16/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.12.17/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.13.10/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.13.11/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.13.12/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.13.13/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.13.5/ch/epfl/scala/profilers/tools/SettingsOps.scala

-9
This file was deleted.

plugin/src/main/scala-2.13.6/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.13.7/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.13.8/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

plugin/src/main/scala-2.13.9/ch/epfl/scala/profilers/tools/SettingsOps.scala

-8
This file was deleted.

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.11

0 commit comments

Comments
 (0)