From 97ea6914dcaae5aad0ed7600757d9c31b6a98b3c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 00:29:59 +0000 Subject: [PATCH 1/3] Update sbt-scalafix to 0.12.1 --- project/plugins.sbt | 2 +- zio-sbt-ecosystem/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 43a7d9bc..32fe6c28 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.17") // Linting Plugins addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") // Versioning and Release Plugins diff --git a/zio-sbt-ecosystem/build.sbt b/zio-sbt-ecosystem/build.sbt index 09856059..0439e811 100644 --- a/zio-sbt-ecosystem/build.sbt +++ b/zio-sbt-ecosystem/build.sbt @@ -3,7 +3,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.17") // Linting Plugins addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") // Versioning and Release Plugins From be8d64000fbb6b4183b376ada8ed57f15313e8d9 Mon Sep 17 00:00:00 2001 From: jules Ivanic Date: Tue, 7 May 2024 23:17:41 +0800 Subject: [PATCH 2/3] Fix compilation --- .../src/main/scala/zio/sbt/ScalaCompilerSettings.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala index fd62bbf5..7f6af569 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala @@ -22,7 +22,7 @@ import sbt.Keys._ import sbt.{Def, _} import sbtbuildinfo.BuildInfoPlugin.autoImport.{BuildInfoKey, buildInfoKeys, buildInfoPackage} import sbtcrossproject.CrossPlugin.autoImport.{JVMPlatform, crossProjectPlatform} -import scalafix.sbt.ScalafixPlugin.autoImport.{scalafixDependencies, scalafixScalaBinaryVersion, scalafixSemanticdb} +import scalafix.sbt.ScalafixPlugin.autoImport.{scalafixDependencies, scalafixSemanticdb} import zio.sbt.Versions._ @@ -208,7 +208,6 @@ trait ScalaCompilerSettings { semanticdbEnabled := Keys.scalaBinaryVersion.value != "3", semanticdbOptions += "-P:semanticdb:synthetics:on", semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version - ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(Keys.scalaVersion.value), ThisBuild / scalafixDependencies ++= List( "com.github.vovapolu" %% "scaluzzi" % ScaluzziVersion ) From 345c26bd91e0b3b0c238701bc519a06fb7a08bc4 Mon Sep 17 00:00:00 2001 From: jules Ivanic Date: Tue, 7 May 2024 23:23:19 +0800 Subject: [PATCH 3/3] scalafmt --- .../src/main/scala/zio/sbt/ScalaCompilerSettings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala index 7f6af569..1fc5b90a 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala @@ -207,7 +207,7 @@ trait ScalaCompilerSettings { Seq( semanticdbEnabled := Keys.scalaBinaryVersion.value != "3", semanticdbOptions += "-P:semanticdb:synthetics:on", - semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version + semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version ThisBuild / scalafixDependencies ++= List( "com.github.vovapolu" %% "scaluzzi" % ScaluzziVersion )