From 0d3abd22003eb5bac9c83153a394f8423385d244 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 10 Sep 2021 16:59:53 +0200 Subject: [PATCH] Update sbt-scalafix to 0.9.30 (#30648) * Update sbt-scalafix to 0.9.30 * Fix ConsoleLogger import To reflect sbt-scalafix f97e8f3cd71c3efe431417f7376dd30b550f11a9 Co-authored-by: Arnout Engelen --- project/ProjectFileIgnoreSupport.scala | 4 ++-- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/ProjectFileIgnoreSupport.scala b/project/ProjectFileIgnoreSupport.scala index ffd2b6a22c..5ce919b458 100644 --- a/project/ProjectFileIgnoreSupport.scala +++ b/project/ProjectFileIgnoreSupport.scala @@ -7,10 +7,10 @@ package akka import java.io.File import com.typesafe.config.ConfigFactory -import sbt.internal.sbtscalafix.Compat +import sbt.ConsoleLogger class ProjectFileIgnoreSupport(ignoreConfigFile: File, descriptor: String) { - private val stdoutLogger = Compat.ConsoleLogger(System.out) + private val stdoutLogger = ConsoleLogger(System.out) private val javaSourceDirectories = Set("java", Jdk9.JAVA_SOURCE_DIRECTORY, Jdk9.JAVA_TEST_SOURCE_DIRECTORY) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8010144424..49270687aa 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ libraryDependencies += Defaults.sbtPluginExtra( addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1") addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.30") // sbt-osgi 0.9.5 is available but breaks including jdk9-only classes // sbt-osgi 0.9.6 is available but breaks populating akka-protobuf-v3 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")