Skip to content

Commit 4b6945a

Browse files
authored
Drop Scala 2.11 & update dependencies (#693)
1 parent 87f9d1a commit 4b6945a

File tree

6 files changed

+13
-28
lines changed

6 files changed

+13
-28
lines changed

.github/workflows/pr-checks.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ jobs:
1010
matrix:
1111
java: [8, 11]
1212
scala:
13-
- 2.11.12
14-
- 2.12.15
1513
- 2.12.16
16-
- 2.13.8
14+
- 2.12.17
1715
- 2.13.9
1816
- 2.13.10
1917
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Scapegoat
33

44
[![Codecov](https://img.shields.io/codecov/c/github/sksamuel/scapegoat)](https://codecov.io/gh/sksamuel/scapegoat)
55
[<img src="https://img.shields.io/maven-central/v/com.sksamuel.scapegoat/scalac-scapegoat-plugin_2.11.12.svg?label=latest%20release%20for%202.11.12"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22scalac-scapegoat-plugin_2.11.12%22)
6-
[<img src="https://img.shields.io/maven-central/v/com.sksamuel.scapegoat/scalac-scapegoat-plugin_2.12.16.svg?label=latest%20release%20for%202.12.16"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22scalac-scapegoat-plugin_2.12.16%22)
6+
[<img src="https://img.shields.io/maven-central/v/com.sksamuel.scapegoat/scalac-scapegoat-plugin_2.12.16.svg?label=latest%20release%20for%202.12.17"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22scalac-scapegoat-plugin_2.12.16%22)
77
[<img src="https://img.shields.io/maven-central/v/com.sksamuel.scapegoat/scalac-scapegoat-plugin_2.13.10.svg?label=latest%20release%20for%202.13.10"/>](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22scalac-scapegoat-plugin_2.13.10%22)
88
[![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
99

build.sbt

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// compiler plugins
2-
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.5.13" cross CrossVersion.full)
2+
addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.6.0" cross CrossVersion.full)
33

44
name := "scalac-scapegoat-plugin"
55
organization := "com.sksamuel.scapegoat"
@@ -22,9 +22,8 @@ developers := List(
2222
)
2323
)
2424

25-
2625
scalaVersion := "2.13.10"
27-
crossScalaVersions := Seq("2.11.12", "2.12.16", "2.12.17", "2.13.8", "2.13.9", "2.13.10")
26+
crossScalaVersions := Seq("2.12.16", "2.12.17", "2.13.9", "2.13.10")
2827
autoScalaLibrary := false
2928
crossVersion := CrossVersion.full
3029
crossTarget := {
@@ -54,18 +53,7 @@ val scalac12Options = Seq(
5453
"-Xmax-classfile-name",
5554
"254"
5655
)
57-
val scalac11Options = Seq(
58-
"-Ywarn-adapted-args",
59-
"-Ywarn-inaccessible",
60-
"-Ywarn-infer-any",
61-
"-Ywarn-nullary-override",
62-
"-Ywarn-dead-code",
63-
"-Ywarn-nullary-unit",
64-
"-Ywarn-numeric-widen",
65-
"-Xmax-classfile-name",
66-
"254"
67-
// "-Ywarn-value-discard"
68-
)
56+
6957
scalacOptions := {
7058
val common = Seq(
7159
"-unchecked",
@@ -76,7 +64,6 @@ scalacOptions := {
7664
"-Xlint"
7765
)
7866
common ++ (scalaBinaryVersion.value match {
79-
case "2.11" => scalac11Options
8067
case "2.12" => scalac12Options
8168
case "2.13" =>
8269
scalac13Options ++ (scalaVersion.value.split('.') match {
@@ -105,16 +92,16 @@ def check(code: String) = {
10592
libraryDependencies ++= Seq(
10693
"org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
10794
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
108-
"org.scala-lang.modules" %% "scala-xml" % "1.3.0" excludeAll ExclusionRule(organization = "org.scala-lang"),
95+
"org.scala-lang.modules" %% "scala-xml" % "2.1.0" excludeAll ExclusionRule(organization = "org.scala-lang"),
10996
"org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1" excludeAll ExclusionRule(organization =
11097
"org.scala-lang"
11198
),
11299
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "test",
113-
"org.scalatest" %% "scalatest" % "3.2.13" % "test",
100+
"org.scalatest" %% "scalatest" % "3.2.14" % "test",
114101
"org.mockito" % "mockito-all" % "1.10.19" % "test",
115-
"joda-time" % "joda-time" % "2.11.1" % "test",
102+
"joda-time" % "joda-time" % "2.11.2" % "test",
116103
"org.joda" % "joda-convert" % "2.2.2" % "test",
117-
"org.slf4j" % "slf4j-api" % "2.0.1" % "test"
104+
"org.slf4j" % "slf4j-api" % "2.0.3" % "test"
118105
)
119106

120107
// Test

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.7.1
1+
sbt.version=1.7.2

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ resolvers += Classpaths.sbtPluginReleases
33
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
44
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
55
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
6-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
7-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.2")
6+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.5")
7+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
88

99
if (System.getProperty("add-scapegoat-plugin") == "true")
1010
addSbtPlugin(s"com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0")

src/main/scala/com/sksamuel/scapegoat/Feedback.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class Feedback(
6767
adjustedLevel match {
6868
case Levels.Error => reporter.error(pos, report)
6969
case Levels.Warning => reporter.warning(pos, report)
70-
case Levels.Info => reporter.info(pos, report, force = false)
70+
case Levels.Info => reporter.echo(pos, report)
7171
}
7272
}
7373
}

0 commit comments

Comments
 (0)