Skip to content

Update scalafmt and scalafix setting #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2025
Merged

Update scalafmt and scalafix setting #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a651a32
Update scalafmt and scalafix setting
xuwei-k Oct 12, 2025
01ccf4e
Merge branch 'main' into scalafmt
raboof Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .scalafix.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ DisableSyntax.noFinalize = true
DisableSyntax.noValPatterns = true
OrganizeImports {
groupedImports = Merge
targetDialect = Scala3
preset = DEFAULT
}
5 changes: 4 additions & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = 3.10.0
runner.dialect = scala212
runner.dialect = scala212source3
maxColumn = 120
project.git = true

Expand All @@ -11,6 +11,9 @@ docstrings.style = Asterisk
spaces.inImportCurlyBraces = true

rewrite.trailingCommas.style = keep
rewrite.scala3.convertToNewSyntax = true
runner.dialectOverride.allowSignificantIndentation = false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I would be fine with allowing it... but OK to be conservative :)

project.layout = StandardConvention

align.tokens."+" = [
{
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: MIT

import sbt._
import sbt.*

object Dependencies {
lazy val library = Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/Project.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: MIT

import sbt._
import sbt.*

object Project {
lazy val description: String =
Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/com/github/sbt/sbom/BomExtractor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
8 changes: 4 additions & 4 deletions src/main/scala/com/github/sbt/sbom/BomSbtPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/com/github/sbt/sbom/BomSbtSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]] =
Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/com/github/sbt/sbom/BomTask.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/github/sbt/sbom/MakeBomTask.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package com.github.sbt.sbom

import sbt._
import sbt.*

class MakeBomTask(properties: BomTaskProperties, bomFile: File) extends BomTask[File](properties) {

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/github/sbt/sbom/licenses/LicensesArchiveJsonParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down