From 238a79d30032e179b9c38814e7ca72e20fa38971 Mon Sep 17 00:00:00 2001 From: Frank Thomas Date: Fri, 10 Jan 2025 08:21:58 +0100 Subject: [PATCH] Set `rewrite.scala3.convertToNewSyntax` to `true` ... so that wildcard imports are rewritten from `_` to `*` --- .scalafmt.conf | 1 + .../org/scalasteward/benchmark/UpdatesConfigBenchmark.scala | 2 +- .../benchmark/VersionPositionScannerBenchmark.scala | 2 +- project/Dependencies.scala | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 6cea8df82..7455a7740 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -5,3 +5,4 @@ align.openParenCallSite = false align.openParenDefnSite = false maxColumn = 100 rewrite.rules = [AvoidInfix, PreferCurlyFors, RedundantBraces, SortImports, SortModifiers] +rewrite.scala3.convertToNewSyntax = true diff --git a/modules/benchmark/src/main/scala/org/scalasteward/benchmark/UpdatesConfigBenchmark.scala b/modules/benchmark/src/main/scala/org/scalasteward/benchmark/UpdatesConfigBenchmark.scala index a20bca2cb..182f8f528 100644 --- a/modules/benchmark/src/main/scala/org/scalasteward/benchmark/UpdatesConfigBenchmark.scala +++ b/modules/benchmark/src/main/scala/org/scalasteward/benchmark/UpdatesConfigBenchmark.scala @@ -18,7 +18,7 @@ package org.scalasteward.benchmark import java.util.concurrent.TimeUnit import org.openjdk.jmh.annotations.{Benchmark, BenchmarkMode, Mode, OutputTimeUnit} -import org.scalasteward.core.data._ +import org.scalasteward.core.data.* import org.scalasteward.core.repoconfig.{UpdatePattern, UpdatesConfig, VersionPattern} import org.scalasteward.core.util.Nel diff --git a/modules/benchmark/src/main/scala/org/scalasteward/benchmark/VersionPositionScannerBenchmark.scala b/modules/benchmark/src/main/scala/org/scalasteward/benchmark/VersionPositionScannerBenchmark.scala index 48295ef00..a6065848e 100644 --- a/modules/benchmark/src/main/scala/org/scalasteward/benchmark/VersionPositionScannerBenchmark.scala +++ b/modules/benchmark/src/main/scala/org/scalasteward/benchmark/VersionPositionScannerBenchmark.scala @@ -17,7 +17,7 @@ package org.scalasteward.benchmark import java.util.concurrent.TimeUnit -import org.openjdk.jmh.annotations._ +import org.openjdk.jmh.annotations.* import org.scalasteward.core.data.Version import org.scalasteward.core.edit.update.VersionPositionScanner import org.scalasteward.core.io.FileData diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 95be4132a..320df96b0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,4 +1,4 @@ -import sbt._ +import sbt.* object Dependencies { val bcprovJdk15to18 = "org.bouncycastle" % "bcprov-jdk15to18" % "1.79"