Skip to content

Commit 4c04034

Browse files
committed
Update scalafmt setting
1 parent defc51e commit 4c04034

File tree

9 files changed

+20
-17
lines changed

9 files changed

+20
-17
lines changed

.scalafmt.conf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version = 3.9.10
2-
runner.dialect = scala212
2+
runner.dialect = scala212source3
33
maxColumn = 120
44
project.git = true
55

@@ -11,6 +11,9 @@ docstrings.style = Asterisk
1111
spaces.inImportCurlyBraces = true
1212

1313
rewrite.trailingCommas.style = keep
14+
rewrite.scala3.convertToNewSyntax = true
15+
runner.dialectOverride.allowSignificantIndentation = false
16+
project.layout = StandardConvention
1417

1518
align.tokens."+" = [
1619
{

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: MIT
44

5-
import sbt._
5+
import sbt.*
66

77
object Dependencies {
88
lazy val library = Seq(

project/Project.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: MIT
44

5-
import sbt._
5+
import sbt.*
66

77
object Project {
88
lazy val description: String =

src/main/scala/com/github/sbt/sbom/BomExtractor.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import org.cyclonedx.model.{
2020
Tool
2121
}
2222
import org.cyclonedx.util.BomUtils
23-
import sbt._
23+
import sbt.*
2424
import sbt.librarymanagement.ModuleReport
2525

26-
import java.util.{ TreeMap => TM, UUID }
27-
import scala.collection.JavaConverters._
26+
import java.util.{ TreeMap as TM, UUID }
27+
import scala.collection.JavaConverters.*
2828

2929
import SbtUpdateReport.{ ModuleGraph, getModuleQualifier }
3030

src/main/scala/com/github/sbt/sbom/BomSbtPlugin.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
package com.github.sbt.sbom
66

7-
import com.github.sbt.sbom.PluginConstants._
7+
import com.github.sbt.sbom.PluginConstants.*
88
import org.cyclonedx.model.Component
99
import sbt.Keys.{ artifact, configuration, packagedArtifacts, version }
1010
import sbt.plugins.JvmPlugin
11-
import sbt.{ Def, _ }
11+
import sbt.*
1212

1313
import scala.language.postfixOps
1414

@@ -65,9 +65,9 @@ object BomSbtPlugin extends AutoPlugin {
6565
)
6666
}
6767

68-
import autoImport._
68+
import autoImport.*
6969

70-
override lazy val projectSettings: Seq[Setting[_]] = {
70+
override lazy val projectSettings: Seq[Setting[?]] = {
7171
val bomFileNameSetting = Def.setting {
7272
val artifactId = artifact.value.name
7373
val artifactVersion = version.value

src/main/scala/com/github/sbt/sbom/BomSbtSettings.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
package com.github.sbt.sbom
66

7-
import com.github.sbt.sbom.BomSbtPlugin.autoImport._
7+
import com.github.sbt.sbom.BomSbtPlugin.autoImport.*
88
import sbt.Keys.{ projectID, sLog, scalaBinaryVersion, scalaVersion, target }
9-
import sbt._
9+
import sbt.*
1010

1111
object BomSbtSettings {
1212
def makeBomTask(report: UpdateReport, currentConfiguration: Configuration): Def.Initialize[Task[sbt.File]] =

src/main/scala/com/github/sbt/sbom/BomTask.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
package com.github.sbt.sbom
66

7-
import com.github.sbt.sbom.PluginConstants._
7+
import com.github.sbt.sbom.PluginConstants.*
88
import org.apache.commons.io.FileUtils
99
import org.cyclonedx.Version
1010
import org.cyclonedx.generators.BomGeneratorFactory
1111
import org.cyclonedx.model.Bom
1212
import org.cyclonedx.parsers.{ JsonParser, XmlParser }
13-
import sbt._
13+
import sbt.*
1414

1515
import java.nio.charset.Charset
16-
import scala.collection.JavaConverters._
16+
import scala.collection.JavaConverters.*
1717

1818
final case class BomTaskProperties(
1919
report: UpdateReport,

src/main/scala/com/github/sbt/sbom/MakeBomTask.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package com.github.sbt.sbom
66

7-
import sbt._
7+
import sbt.*
88

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

src/main/scala/com/github/sbt/sbom/licenses/LicensesArchiveJsonParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package com.github.sbt.sbom.licenses
66

77
import io.circe.Decoder
88
import io.circe.generic.semiauto.deriveDecoder
9-
import io.circe.parser._
9+
import io.circe.parser.*
1010

1111
import scala.util.control.NonFatal
1212

0 commit comments

Comments
 (0)