diff --git a/.scalafix.conf b/.scalafix.conf index 0ef272b..bc2e330 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -22,5 +22,6 @@ DisableSyntax.noFinalize = true DisableSyntax.noValPatterns = true OrganizeImports { groupedImports = Merge + targetDialect = Scala3 preset = DEFAULT } diff --git a/.scalafmt.conf b/.scalafmt.conf index 6b7b916..6354b7a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,5 @@ version = 3.10.0 -runner.dialect = scala212 +runner.dialect = scala212source3 maxColumn = 120 project.git = true @@ -11,6 +11,9 @@ docstrings.style = Asterisk spaces.inImportCurlyBraces = true rewrite.trailingCommas.style = keep +rewrite.scala3.convertToNewSyntax = true +runner.dialectOverride.allowSignificantIndentation = false +project.layout = StandardConvention align.tokens."+" = [ { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e8be00e..3f35829 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Dependencies { lazy val library = Seq( diff --git a/project/Project.scala b/project/Project.scala index 23f4dac..3f93472 100644 --- a/project/Project.scala +++ b/project/Project.scala @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -import sbt._ +import sbt.* object Project { lazy val description: String = diff --git a/src/main/scala/com/github/sbt/sbom/BomExtractor.scala b/src/main/scala/com/github/sbt/sbom/BomExtractor.scala index 3527e2d..e35a3a3 100644 --- a/src/main/scala/com/github/sbt/sbom/BomExtractor.scala +++ b/src/main/scala/com/github/sbt/sbom/BomExtractor.scala @@ -20,11 +20,11 @@ import org.cyclonedx.model.{ Tool } import org.cyclonedx.util.BomUtils -import sbt._ +import sbt.* import sbt.librarymanagement.ModuleReport -import java.util.{ TreeMap => TM, UUID } -import scala.collection.JavaConverters._ +import java.util.{ TreeMap as TM, UUID } +import scala.collection.JavaConverters.* import SbtUpdateReport.{ ModuleGraph, getModuleQualifier } diff --git a/src/main/scala/com/github/sbt/sbom/BomSbtPlugin.scala b/src/main/scala/com/github/sbt/sbom/BomSbtPlugin.scala index 56533ec..42b4d2d 100644 --- a/src/main/scala/com/github/sbt/sbom/BomSbtPlugin.scala +++ b/src/main/scala/com/github/sbt/sbom/BomSbtPlugin.scala @@ -4,11 +4,11 @@ package com.github.sbt.sbom -import com.github.sbt.sbom.PluginConstants._ +import com.github.sbt.sbom.PluginConstants.* import org.cyclonedx.model.Component +import sbt.* import sbt.Keys.{ artifact, configuration, packagedArtifacts, version } import sbt.plugins.JvmPlugin -import sbt.{ Def, _ } import scala.language.postfixOps @@ -65,9 +65,9 @@ object BomSbtPlugin extends AutoPlugin { ) } - import autoImport._ + import autoImport.* - override lazy val projectSettings: Seq[Setting[_]] = { + override lazy val projectSettings: Seq[Setting[?]] = { val bomFileNameSetting = Def.setting { val artifactId = artifact.value.name val artifactVersion = version.value diff --git a/src/main/scala/com/github/sbt/sbom/BomSbtSettings.scala b/src/main/scala/com/github/sbt/sbom/BomSbtSettings.scala index c405c84..3ca1516 100644 --- a/src/main/scala/com/github/sbt/sbom/BomSbtSettings.scala +++ b/src/main/scala/com/github/sbt/sbom/BomSbtSettings.scala @@ -4,9 +4,9 @@ package com.github.sbt.sbom -import com.github.sbt.sbom.BomSbtPlugin.autoImport._ +import com.github.sbt.sbom.BomSbtPlugin.autoImport.* +import sbt.* import sbt.Keys.{ projectID, sLog, scalaBinaryVersion, scalaVersion, target } -import sbt._ object BomSbtSettings { def makeBomTask(report: UpdateReport, currentConfiguration: Configuration): Def.Initialize[Task[sbt.File]] = diff --git a/src/main/scala/com/github/sbt/sbom/BomTask.scala b/src/main/scala/com/github/sbt/sbom/BomTask.scala index c52cc0c..42b8506 100644 --- a/src/main/scala/com/github/sbt/sbom/BomTask.scala +++ b/src/main/scala/com/github/sbt/sbom/BomTask.scala @@ -4,16 +4,16 @@ package com.github.sbt.sbom -import com.github.sbt.sbom.PluginConstants._ +import com.github.sbt.sbom.PluginConstants.* import org.apache.commons.io.FileUtils import org.cyclonedx.Version import org.cyclonedx.generators.BomGeneratorFactory import org.cyclonedx.model.Bom import org.cyclonedx.parsers.{ JsonParser, XmlParser } -import sbt._ +import sbt.* import java.nio.charset.Charset -import scala.collection.JavaConverters._ +import scala.collection.JavaConverters.* final case class BomTaskProperties( report: UpdateReport, diff --git a/src/main/scala/com/github/sbt/sbom/MakeBomTask.scala b/src/main/scala/com/github/sbt/sbom/MakeBomTask.scala index bfc7707..ef9d901 100644 --- a/src/main/scala/com/github/sbt/sbom/MakeBomTask.scala +++ b/src/main/scala/com/github/sbt/sbom/MakeBomTask.scala @@ -4,7 +4,7 @@ package com.github.sbt.sbom -import sbt._ +import sbt.* class MakeBomTask(properties: BomTaskProperties, bomFile: File) extends BomTask[File](properties) { diff --git a/src/main/scala/com/github/sbt/sbom/licenses/LicensesArchiveJsonParser.scala b/src/main/scala/com/github/sbt/sbom/licenses/LicensesArchiveJsonParser.scala index bfb1039..68d4172 100644 --- a/src/main/scala/com/github/sbt/sbom/licenses/LicensesArchiveJsonParser.scala +++ b/src/main/scala/com/github/sbt/sbom/licenses/LicensesArchiveJsonParser.scala @@ -6,7 +6,7 @@ package com.github.sbt.sbom.licenses import io.circe.Decoder import io.circe.generic.semiauto.deriveDecoder -import io.circe.parser._ +import io.circe.parser.* import scala.util.control.NonFatal