Skip to content

Commit eae30d0

Browse files
authored
Merge pull request #3533 from scala-steward-org/topic/more-scala-3-syntax
Fix "Scala 2 syntax with -Xsource:3" warnings
2 parents c75d82f + 238a79d commit eae30d0

File tree

204 files changed

+420
-427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+420
-427
lines changed

.scalafmt.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ align.openParenCallSite = false
55
align.openParenDefnSite = false
66
maxColumn = 100
77
rewrite.rules = [AvoidInfix, PreferCurlyFors, RedundantBraces, SortImports, SortModifiers]
8+
rewrite.scala3.convertToNewSyntax = true

modules/benchmark/src/main/scala/org/scalasteward/benchmark/UpdatesConfigBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.scalasteward.benchmark
1818

1919
import java.util.concurrent.TimeUnit
2020
import org.openjdk.jmh.annotations.{Benchmark, BenchmarkMode, Mode, OutputTimeUnit}
21-
import org.scalasteward.core.data._
21+
import org.scalasteward.core.data.*
2222
import org.scalasteward.core.repoconfig.{UpdatePattern, UpdatesConfig, VersionPattern}
2323
import org.scalasteward.core.util.Nel
2424

modules/benchmark/src/main/scala/org/scalasteward/benchmark/VersionPositionScannerBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.scalasteward.benchmark
1818

1919
import java.util.concurrent.TimeUnit
20-
import org.openjdk.jmh.annotations._
20+
import org.openjdk.jmh.annotations.*
2121
import org.scalasteward.core.data.Version
2222
import org.scalasteward.core.edit.update.VersionPositionScanner
2323
import org.scalasteward.core.io.FileData

modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ package org.scalasteward.core.application
1919
import better.files.File
2020
import cats.data.Validated
2121
import cats.effect.ExitCode
22-
import cats.syntax.all._
22+
import cats.syntax.all.*
23+
import com.monovore.decline.*
2324
import com.monovore.decline.Opts.{flag, option, options}
24-
import com.monovore.decline._
2525
import org.http4s.Uri
26-
import org.http4s.syntax.literals._
27-
import org.scalasteward.core.application.Config._
26+
import org.http4s.syntax.literals.*
27+
import org.scalasteward.core.application.Config.*
2828
import org.scalasteward.core.application.ExitCodePolicy.{
2929
SuccessIfAnyRepoSucceeds,
3030
SuccessOnlyIfAllReposSucceed
@@ -36,8 +36,7 @@ import org.scalasteward.core.forge.github.GitHubApp
3636
import org.scalasteward.core.git.Author
3737
import org.scalasteward.core.util.Nel
3838
import org.scalasteward.core.util.dateTime.renderFiniteDuration
39-
40-
import scala.concurrent.duration._
39+
import scala.concurrent.duration.*
4140

4241
object Cli {
4342
final case class EnvVar(name: String, value: String)

modules/core/src/main/scala/org/scalasteward/core/application/Config.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package org.scalasteward.core.application
1919
import better.files.File
2020
import org.http4s.Uri
2121
import org.scalasteward.core.application.Cli.EnvVar
22-
import org.scalasteward.core.application.Config._
22+
import org.scalasteward.core.application.Config.*
2323
import org.scalasteward.core.data.Resolver
2424
import org.scalasteward.core.forge.ForgeType
2525
import org.scalasteward.core.forge.github.GitHubApp

modules/core/src/main/scala/org/scalasteward/core/application/Context.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package org.scalasteward.core.application
1818

19-
import cats.effect._
20-
import cats.effect.implicits._
21-
import cats.syntax.all._
19+
import cats.effect.*
20+
import cats.effect.implicits.*
21+
import cats.syntax.all.*
2222
import eu.timepit.refined.types.numeric.PosInt
2323
import org.http4s.Uri
2424
import org.http4s.client.Client
@@ -34,20 +34,20 @@ import org.scalasteward.core.coursier.{CoursierAlg, VersionsCache}
3434
import org.scalasteward.core.data.Repo
3535
import org.scalasteward.core.edit.EditAlg
3636
import org.scalasteward.core.edit.hooks.HookExecutor
37-
import org.scalasteward.core.edit.scalafix._
37+
import org.scalasteward.core.edit.scalafix.*
3838
import org.scalasteward.core.edit.update.ScannerAlg
3939
import org.scalasteward.core.forge.{ForgeApiAlg, ForgeAuthAlg, ForgeRepoAlg, ForgeSelection}
4040
import org.scalasteward.core.git.{GenGitAlg, GitAlg}
4141
import org.scalasteward.core.io.{FileAlg, ProcessAlg, WorkspaceAlg}
4242
import org.scalasteward.core.nurture.{NurtureAlg, PullRequestRepository, UpdateInfoUrlFinder}
4343
import org.scalasteward.core.persistence.{CachingKeyValueStore, JsonKeyValueStore}
44-
import org.scalasteward.core.repocache._
44+
import org.scalasteward.core.repocache.*
4545
import org.scalasteward.core.repoconfig.{RepoConfigAlg, RepoConfigLoader}
4646
import org.scalasteward.core.scalafmt.ScalafmtAlg
4747
import org.scalasteward.core.update.artifact.{ArtifactMigrationsFinder, ArtifactMigrationsLoader}
4848
import org.scalasteward.core.update.{FilterAlg, PruningAlg, UpdateAlg}
49-
import org.scalasteward.core.util._
50-
import org.scalasteward.core.util.uri._
49+
import org.scalasteward.core.util.*
50+
import org.scalasteward.core.util.uri.*
5151
import org.typelevel.log4cats.Logger
5252
import org.typelevel.log4cats.slf4j.Slf4jLogger
5353

modules/core/src/main/scala/org/scalasteward/core/application/ReposFilesLoader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.scalasteward.core.application
1818

1919
import cats.effect.Sync
20-
import cats.syntax.all._
20+
import cats.syntax.all.*
2121
import fs2.Stream
2222
import org.http4s.Uri
2323
import org.scalasteward.core.data.Repo

modules/core/src/main/scala/org/scalasteward/core/application/RunResults.scala

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

1717
package org.scalasteward.core.application
1818

19-
import cats.syntax.all._
19+
import cats.syntax.all.*
2020
import org.scalasteward.core.data.Repo
2121

2222
case class RunResults(results: List[Either[(Repo, Throwable), Repo]]) {

modules/core/src/main/scala/org/scalasteward/core/application/SelfCheckAlg.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.scalasteward.core.application
1818

1919
import cats.MonadThrow
20-
import cats.syntax.all._
20+
import cats.syntax.all.*
2121
import org.scalasteward.core.edit.scalafix.ScalafixCli
2222
import org.scalasteward.core.edit.scalafix.ScalafixCli.scalafixBinary
2323
import org.scalasteward.core.git.GitAlg

modules/core/src/main/scala/org/scalasteward/core/application/StewardAlg.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.scalasteward.core.application
1818

1919
import cats.effect.{ExitCode, Sync}
20-
import cats.syntax.all._
20+
import cats.syntax.all.*
2121
import fs2.Stream
2222
import org.scalasteward.core.data.Repo
2323
import org.scalasteward.core.forge.ForgeAuthAlg

0 commit comments

Comments
 (0)