scalacenter · Jun 3, 2023 · Jun 3, 2023 · Jun 5, 2023 · Jun 6, 2023 · Jun 15, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,14 +9,14 @@ jobs:
     name: JDK8 tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: olafurpg/setup-scala@v14
       - run: sbt test scripted
   jdk11:
     name: JDK11 tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: olafurpg/setup-scala@v14
         with:
           java-version: adopt@1.11
@@ -25,7 +25,7 @@ jobs:
     name: JDK17 tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: olafurpg/setup-scala@v14
         with:
           java-version: 17
@@ -34,14 +34,14 @@ jobs:
     name: Windows tests
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: olafurpg/setup-scala@v14
       - run: sbt ci-windows
         shell: bash
   checks:
     name: Scalafmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: olafurpg/setup-scala@v14
       - run: ./bin/scalafmt --test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: olafurpg/setup-scala@v14
       - uses: olafurpg/setup-gpg@v3
       - run: git fetch --unshallow

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.4"
+version = "3.7.13"
 project.git=true
 align.preset=none
 assumeStandardLibraryStripMargin = true

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,28 @@
+BSD 3-Clause License
+
+Copyright (c) 2016-2023, EPFL
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/build.sbt b/build.sbt
@@ -45,7 +45,7 @@ libraryDependencies ++= List(
   "org.scalatest" %% "scalatest" % "3.2.16" % Test
 )
 
-scalaVersion := "2.12.17"
+scalaVersion := "2.12.18"
 
 // keep this as low as possible to avoid running into binary incompatibility such as https://github.com/sbt/sbt/issues/5049
 pluginCrossBuild / sbtVersion := "1.3.1"

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,11 +2,11 @@ import sbt._
 
 object Dependencies {
   val x = List(1) // scalafix:ok
-  def scalafixVersion: String = "0.11.0"
+  def scalafixVersion: String = "0.11.1"
 
   val all = List(
-    "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.1.202206130422-r",
+    "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.2.202306221912-r",
     "ch.epfl.scala" % "scalafix-interfaces" % scalafixVersion,
-    "io.get-coursier" % "interface" % "1.0.16"
+    "io.get-coursier" % "interface" % "1.0.18"
   )
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 resolvers ++= Resolver.sonatypeOssRepos("public")
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 Compile / unmanagedSourceDirectories ++= {

diff --git a/src/main/scala/scalafix/sbt/ScalafixPlugin.scala b/src/main/scala/scalafix/sbt/ScalafixPlugin.scala
@@ -15,6 +15,7 @@ import scalafix.internal.sbt._
 
 import scala.collection.JavaConverters.collectionAsScalaIterableConverter
 import scala.util.control.NoStackTrace
+import sbt.librarymanagement.ResolveException
 
 object ScalafixPlugin extends AutoPlugin {
   override def trigger: PluginTrigger = allRequirements
@@ -164,6 +165,37 @@ object ScalafixPlugin extends AutoPlugin {
         SettingKey[Boolean]("bspEnabled") := false
       )
     ),
+    update := {
+      object SemanticdbScalac {
+        def unapply(id: ModuleID): Option[String] =
+          if (
+            id.organization == scalafixSemanticdb.organization &&
+            id.name.startsWith(scalafixSemanticdb.name)
+          ) Some(id.revision)
+          else None
+      }
+
+      update.result.value match {
+        case Value(v) => v
+        case Inc(inc: Incomplete) =>
+          Incomplete.allExceptions(inc).toList match {
+            case (resolveException: ResolveException) :: Nil =>
+              resolveException.failed.headOption match {
+                case Some(SemanticdbScalac(rev)) =>
+                  val scalaV = scalaVersion.value
+                  val msg = s"The SemanticDB scalac plugin version ${rev} set up " +
+                    "via `semanticdbVersion` does follow the version recommended " +
+                    "for Scalafix, but is not supported for the outdated Scala " +
+                    s"version ${scalaV}. Please upgrade to a more recent Scala " +
+                    "patch version or uninstall sbt-scalafix."
+                  throw inc.copy(message = Some(msg))
+                case _ =>
+              }
+            case _ =>
+          }
+          throw inc
+      }
+    },
     ivyConfigurations += ScalafixConfig,
     scalafixAll := scalafixAllInputTask.evaluated
   )

diff --git a/src/sbt-test/sbt-1.5/scalafixEnable/build.sbt b/src/sbt-test/sbt-1.5/scalafixEnable/build.sbt
@@ -15,7 +15,7 @@ lazy val scala211 = project
 lazy val scala212 = project
   .in(file("scala212"))
   .settings(
-    scalaVersion := "2.12.17" // supported by semanticdb-scalac
+    scalaVersion := "2.12.18" // supported by semanticdb-scalac
   )
 
 lazy val scala3 = project

diff --git a/src/sbt-test/sbt-1.5/testkit/build.sbt b/src/sbt-test/sbt-1.5/testkit/build.sbt
@@ -5,6 +5,7 @@ lazy val scala3Version = "3.0.0"
 
 inThisBuild(
   List(
+    scalaVersion := V.scala212, // don't let tests project fall back to sbt's old default
     semanticdbEnabled := true,
     semanticdbVersion := scalafixSemanticdb.revision,
     // need for sbt <1.7.0 as includePluginResolvers has no effect, see https://github.com/sbt/sbt/pull/6853

diff --git a/src/sbt-test/sbt-1.5/testkit/tests/src/test/scala/fix/InputOutputSuite.scala b/src/sbt-test/sbt-1.5/testkit/tests/src/test/scala/fix/InputOutputSuite.scala
@@ -2,13 +2,13 @@ package fix
 
 import scalafix.testkit._
 import scala.util.control.NonFatal
-import org.scalatest.FunSuiteLike
+import org.scalatest.funsuite.AnyFunSuiteLike
 import org.scalatest.exceptions.TestFailedException
 
 object IntputOutputSuite {
   def main(args: Array[String]): Unit = {
     if (Array("--save-expect").sameElements(args)) {
-      val suite = new AbstractSemanticRuleSuite with FunSuiteLike {
+      val suite = new AbstractSemanticRuleSuite with AnyFunSuiteLike {
         override val props = TestkitProperties.loadFromResources()
         override val isSaveExpect = true
 
@@ -30,6 +30,6 @@ object IntputOutputSuite {
   }
 }
 
-class IntputOutputSuite extends AbstractSemanticRuleSuite with FunSuiteLike {
+class IntputOutputSuite extends AbstractSemanticRuleSuite with AnyFunSuiteLike {
   runAllTests()
 }
diff --git a/src/sbt-test/sbt-scalafix/basic/build.sbt b/src/sbt-test/sbt-scalafix/basic/build.sbt
@@ -1,6 +1,6 @@
 inThisBuild(
   List(
-    scalaVersion := "2.12.14",
+    scalaVersion := "2.12.18",
     libraryDependencies ++= List(
       "org.scalameta" %% "testkit" % "4.3.10" % Test,
       "org.scalameta" %% "munit" % "0.7.9" % Test,

diff --git a/src/sbt-test/sbt-scalafix/inconfig/build.sbt b/src/sbt-test/sbt-scalafix/inconfig/build.sbt
@@ -1,6 +1,6 @@
 inThisBuild(
   List(
-    scalaVersion := "2.12.14",
+    scalaVersion := "2.12.18",
     libraryDependencies ++= List(
       "org.scalameta" %% "testkit" % "4.3.10" % Test,
       "org.scalameta" %% "munit" % "0.7.9" % Test,

diff --git a/src/sbt-test/sbt-scalafix/root-validation/build.sbt b/src/sbt-test/sbt-scalafix/root-validation/build.sbt
@@ -1,6 +1,6 @@
 inThisBuild(
   List(
-    scalaVersion := "2.12.14"
+    scalaVersion := "2.12.18"
   )
 )
 

diff --git a/src/sbt-test/sbt-scalafix/semanticdb-enabled/build.sbt b/src/sbt-test/sbt-scalafix/semanticdb-enabled/build.sbt
@@ -1,6 +1,6 @@
 inThisBuild(
   List(
-    scalaVersion := "2.12.14",
+    scalaVersion := "2.12.18",
     semanticdbEnabled := true,
     semanticdbVersion := scalafixSemanticdb.revision
   )

diff --git a/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/build.sbt b/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/build.sbt
@@ -0,0 +1,22 @@
+inThisBuild(
+  List(
+    semanticdbEnabled := true,
+    semanticdbVersion := scalafixSemanticdb.revision,
+    scalaVersion := "2.13.7" // last semanticdb-scalac published for that scala version is 4.8.4
+  )
+)
+
+lazy val checkLogs =
+  taskKey[Unit]("Check presence of call to action in update logs")
+
+checkLogs := {
+  val taskStreams = (update / streams).value
+  val reader = taskStreams.readText(taskStreams.key)
+  val logLines = Stream
+    .continually(reader.readLine())
+    .takeWhile(_ != null)
+    .force
+  assert(
+    logLines.exists(_.contains("Please upgrade to a more recent Scala patch version or uninstall sbt-scalafix"))
+  )
+}
diff --git a/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/project/plugins.sbt b/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/project/plugins.sbt
@@ -0,0 +1,2 @@
+resolvers += Resolver.sonatypeRepo("public")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("plugin.version"))
diff --git a/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/test b/src/sbt-test/sbt-scalafix/unavailable-semanticdb-scalac/test
@@ -0,0 +1,2 @@
+-> scalafix
+> checkLogs
diff --git a/src/sbt-test/skip-java17/scalafixResolvers/build.sbt b/src/sbt-test/skip-java17/scalafixResolvers/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.7"
+scalaVersion := "2.12.18"
 
 TaskKey[Unit]("check") := {
   val expectedRepositories: Seq[String] = Seq(

diff --git a/src/test/scala/scalafix/internal/sbt/ScalafixAPISuite.scala b/src/test/scala/scalafix/internal/sbt/ScalafixAPISuite.scala
@@ -11,7 +11,6 @@ import org.scalatest.funsuite.AnyFunSuite
 
 import scala.util.Properties
 
-@org.scalatest.Ignore
 class ScalafixAPISuite extends AnyFunSuite {
 
   def assertNoDiff(obtained: String, expected: String)(implicit
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		resolvers += Resolver.sonatypeRepo("public")
		addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("plugin.version"))