Skip to content

Commit c75d82f

Browse files
authored
Merge pull request #3532 from xuwei-k/new-syntax
update scalafmt and scalacOptions setting. use new syntax
2 parents cae6c58 + 38e377f commit c75d82f

File tree

7 files changed

+17
-9
lines changed

7 files changed

+17
-9
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version = 3.8.3
2-
runner.dialect = scala213
2+
runner.dialect = scala213source3
33
assumeStandardLibraryStripMargin = true
44
align.openParenCallSite = false
55
align.openParenDefnSite = false

build.sbt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,14 @@ lazy val commonSettings = Def.settings(
311311

312312
lazy val compileSettings = Def.settings(
313313
scalaVersion := Scala213,
314+
scalacOptions ++= {
315+
scalaBinaryVersion.value match {
316+
case "2.13" =>
317+
Seq("-Xsource:3-cross")
318+
case _ =>
319+
Nil
320+
}
321+
},
314322
doctestTestFramework := DoctestTestFramework.Munit
315323
)
316324

modules/core/src/main/scala/org/scalasteward/core/buildtool/sbt/parser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object parser {
3232
val chunks = fs2.Stream.emits(lines).map(removeSbtNoise).split(_ === "--- snip ---")
3333
val decoder = Decoder[Dependency].either(Decoder[Resolver])
3434
chunks.mapFilter { chunk =>
35-
val (dependencies, resolvers) = chunk.toList.flatMap(decode(_)(decoder).toList).separate
35+
val (dependencies, resolvers) = chunk.toList.flatMap(decode(_)(using decoder).toList).separate
3636
Option.when(dependencies.nonEmpty && resolvers.nonEmpty)(
3737
Scope(dependencies, resolvers.sorted)
3838
)

modules/core/src/main/scala/org/scalasteward/core/data/Version.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ final case class Version(value: String) {
112112
case _ => false
113113
} || Rfc5234.hexdig.rep(8).string.filterNot(startsWithDate).parse(value).isRight
114114

115-
private[this] def alnumComponentsWithoutPreRelease: List[Version.Component] =
115+
private def alnumComponentsWithoutPreRelease: List[Version.Component] =
116116
alnumComponents.takeWhile {
117117
case a: Version.Component.Alpha => !a.isPreReleaseIdent
118118
case _ => true

modules/core/src/main/scala/org/scalasteward/core/forge/github/GitHubAppApiAlg.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ class GitHubAppApiAlg[F[_]](
2929
F: Concurrent[F]
3030
) {
3131

32-
private[this] val acceptHeader =
32+
private val acceptHeader =
3333
Header.Raw(ci"Accept", "application/vnd.github.v3+json")
3434

35-
private[this] def addHeaders(jwt: String): client.ModReq =
35+
private def addHeaders(jwt: String): client.ModReq =
3636
req =>
3737
F.point(
3838
req.putHeaders(

modules/core/src/main/scala/org/scalasteward/core/git/FileGitAlg.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ final class FileGitAlg[F[_]](config: Config)(implicit
7171
): F[Commit] = {
7272
val messages = message.paragraphs.foldMap(m => List("-m", m))
7373
val trailers = message.trailers.foldMap { case (k, v) => List("--trailer", s"$k=$v") }
74-
git_("commit" :: "--all" :: sign :: signoff(signoffCommits) :: messages ++ trailers: _*)(
74+
git_(("commit" :: "--all" :: sign :: signoff(signoffCommits) :: messages ++ trailers)*)(
7575
repo
7676
) >>
7777
latestSha1(repo, Branch.head).map(Commit.apply)
@@ -181,7 +181,7 @@ final class FileGitAlg[F[_]](config: Config)(implicit
181181
}
182182

183183
private def git_(args: String*)(repo: File): F[List[String]] =
184-
git(args: _*)(repo, SlurpOptions.ignoreBufferOverflow)
184+
git(args*)(repo, SlurpOptions.ignoreBufferOverflow)
185185

186186
private val sign: String =
187187
if (config.gitCfg.signCommits) "--gpg-sign" else "--no-gpg-sign"

modules/core/src/main/scala/org/scalasteward/core/io/process.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ object process {
6161
)(implicit F: Async[F]): F[List[String]] =
6262
createProcess(args).flatMap { process =>
6363
F.delay(new ListBuffer[String]).flatMap { buffer =>
64-
val raiseError = F.raiseError[List[String]] _
64+
val raiseError = F.raiseError[List[String]]
6565

6666
val result =
6767
readLinesIntoBuffer(process.getInputStream, buffer, maxBufferSize, log)
@@ -91,7 +91,7 @@ object process {
9191

9292
private def createProcessBuilder[F[_]](args: Args)(implicit F: Sync[F]): F[ProcessBuilder] =
9393
F.blocking {
94-
val pb = new ProcessBuilder(args.command.toList: _*)
94+
val pb = new ProcessBuilder(args.command.toList*)
9595
args.workingDirectory.foreach(file => pb.directory(file.toJava))
9696
val env = pb.environment()
9797
if (args.slurpOptions(SlurpOption.ClearEnvironment)) env.clear()

0 commit comments

Comments
 (0)