From eebaf40f802815d4f3e83e66e2a80b06aecff768 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 3 Mar 2024 00:30:57 +0000 Subject: [PATCH 1/2] Update sbt-scalafix to 0.12.0 --- 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 e2ac0995..90f6b6a1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.14") // Linting Plugins addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") 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 8642a9f6..fdd01553 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.14") // Linting Plugins addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") // Versioning and Release Plugins From 4785491eabf9fa3f517c2696c19abfe951c2de8c Mon Sep 17 00:00:00 2001 From: jules Ivanic Date: Sun, 10 Mar 2024 22:27:48 +0800 Subject: [PATCH 2/2] scalafix --- .../src/main/scala/zio/sbt/Commands.scala | 4 ++-- .../src/main/scala/zio/sbt/ScalaCompilerSettings.scala | 10 +++++----- zio-sbt-ecosystem/src/main/scala/zio/sbt/Tasks.scala | 4 ++-- .../src/main/scala/zio/sbt/Versions.scala | 2 +- .../src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala | 6 +++--- .../src/main/scala/zio/sbt/WebsitePlugin.scala | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Commands.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Commands.scala index c32581a9..f34c3e2a 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Commands.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Commands.scala @@ -18,8 +18,8 @@ package zio.sbt import scala.collection.immutable.ListMap -import sbt.Keys.* -import sbt.* +import sbt.Keys._ +import sbt._ object Commands { 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 c19521f4..fd62bbf5 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala @@ -16,15 +16,15 @@ package zio.sbt -import explicitdeps.ExplicitDepsPlugin.autoImport.* -import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport.* -import sbt.Keys.* -import sbt.{Def, *} +import explicitdeps.ExplicitDepsPlugin.autoImport._ +import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ +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 zio.sbt.Versions.* +import zio.sbt.Versions._ trait ScalaCompilerSettings { diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Tasks.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Tasks.scala index a6322377..5d12efcc 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Tasks.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Tasks.scala @@ -18,8 +18,8 @@ package zio.sbt import scala.Console -import sbt.Keys.* -import sbt.* +import sbt.Keys._ +import sbt._ object Tasks { private val strictCompilationProp = "enable.strict.compilation" diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala index e7b32c0e..f6611000 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/Versions.scala @@ -16,7 +16,7 @@ package zio.sbt -import sbt.* +import sbt._ object Versions { val KindProjectorVersion = "0.13.2" diff --git a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala index 27778ebe..ae104b9f 100644 --- a/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala +++ b/zio-sbt-ecosystem/src/main/scala/zio/sbt/ZioSbtEcosystemPlugin.scala @@ -18,12 +18,12 @@ package zio.sbt import scala.collection.immutable.ListMap -import com.jsuereth.sbtpgp.SbtPgp.autoImport.* +import com.jsuereth.sbtpgp.SbtPgp.autoImport._ import de.heikoseeberger.sbtheader.HeaderPlugin import org.scalafmt.sbt.ScalafmtPlugin -import sbt.Keys.* +import sbt.Keys._ import sbt.nio.Keys.{ReloadOnSourceChanges, onChangedBuildSource} -import sbt.{Def, *} +import sbt.{Def, _} import sbtbuildinfo.BuildInfoPlugin import scalafix.sbt.ScalafixPlugin diff --git a/zio-sbt-website/src/main/scala/zio/sbt/WebsitePlugin.scala b/zio-sbt-website/src/main/scala/zio/sbt/WebsitePlugin.scala index 747e3c22..6884a9e6 100644 --- a/zio-sbt-website/src/main/scala/zio/sbt/WebsitePlugin.scala +++ b/zio-sbt-website/src/main/scala/zio/sbt/WebsitePlugin.scala @@ -17,13 +17,13 @@ package zio.sbt import scala.collection.mutable -import scala.sys.process.* +import scala.sys.process._ import _root_.java.nio.file.{Files, Path, Paths} import mdoc.MdocPlugin -import mdoc.MdocPlugin.autoImport.* -import sbt.Keys.* -import sbt.{Def, *} +import mdoc.MdocPlugin.autoImport._ +import sbt.Keys._ +import sbt.{Def, _} import zio.sbt.WebsiteUtils.{readFile, removeYamlHeader}