Skip to content

Commit

Permalink
Merge pull request #461 from typelevel/update/scalafmt-core-3.8.5
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.8.5
  • Loading branch information
rossabaker authored Jan 17, 2025
2 parents 174a9a3 + 3dd8b7c commit c701a06
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 20 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.5
ec4f95a6c64092debebbd352d15c559a94a20ba8
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.2
version = 3.8.5

runner.dialect = Scala213Source3

Expand Down
33 changes: 14 additions & 19 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,17 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % catsV
),
console / initialCommands := {
fullImports(List("cats", "cats.syntax.all", "org.typelevel.ci"), wildcardImport.value)
},
console / initialCommands :=
fullImports(List("cats", "cats.syntax.all", "org.typelevel.ci"), wildcardImport.value),
// For some reason consoleQuick delegates to console, which doesn't make
// sense to me since the only difference is that console compiles the
// local module, but consoleQuick only has the dependencies. That is,
// you'd use consoleQuick if the local build isn't building and you just
// wanted to fiddle with a dependency on the classpath. But the only place
// to put local module imports has to be console, but since consoleQuick
// delegates to that, that will break consoleQuick by default. So...
consoleQuick / initialCommands := {
consoleQuick / initialCommands :=
fullImports(List("cats", "cats.syntax.all"), wildcardImport.value)
}
)
.nativeSettings(
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "1.5.0").toMap
Expand All @@ -67,7 +65,7 @@ lazy val testing = crossProject(JSPlatform, JVMPlatform, NativePlatform)
libraryDependencies ++= Seq(
"org.scalacheck" %%% "scalacheck" % scalacheckV
),
console / initialCommands := {
console / initialCommands :=
fullImports(
List(
"cats",
Expand All @@ -77,11 +75,9 @@ lazy val testing = crossProject(JSPlatform, JVMPlatform, NativePlatform)
"org.typelevel.ci.testing.arbitraries",
"org.scalacheck"),
wildcardImport.value
)
},
consoleQuick / initialCommands := {
),
consoleQuick / initialCommands :=
fullImports(List("cats", "cats.syntax.all", "org.scalacheck"), wildcardImport.value)
}
)
.platformsSettings(JSPlatform, NativePlatform)(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % scalaJavaLocalesV
Expand All @@ -102,7 +98,7 @@ lazy val tests = crossProject(JSPlatform, JVMPlatform, NativePlatform)
"org.scalameta" %%% "munit" % munitV,
"org.typelevel" %%% "discipline-munit" % disciplineMunitV
).map(_ % Test),
Test / console / initialCommands := {
Test / console / initialCommands :=
fullImports(
List(
"cats",
Expand All @@ -112,11 +108,9 @@ lazy val tests = crossProject(JSPlatform, JVMPlatform, NativePlatform)
"org.typelevel.ci.testing.arbitraries",
"org.scalacheck"),
wildcardImport.value
)
},
Test / consoleQuick / initialCommands := {
),
Test / consoleQuick / initialCommands :=
fullImports(List("cats", "cats.syntax.all", "org.scalacheck"), wildcardImport.value)
}
)
.jvmSettings(
Test / testGrouping := {
Expand All @@ -140,9 +134,8 @@ lazy val bench = project
.enablePlugins(JmhPlugin)
.settings(
name := "case-insensitive-bench",
console / initialCommands := {
fullImports(List("cats", "cats.syntax.all", "org.typelevel.ci"), wildcardImport.value)
},
console / initialCommands :=
fullImports(List("cats", "cats.syntax.all", "org.typelevel.ci"), wildcardImport.value),
consoleQuick / initialCommands := ""
)
.dependsOn(core.jvm)
Expand All @@ -168,5 +161,7 @@ inThisBuild(
"https://www.javadoc.io/doc/org.typelevel/case-insensitive_2.13/latest/org/typelevel/ci/index.html")),
startYear := Some(2020),
// Remove cursed tags
tlMimaPreviousVersions ~= { old => old -- Set("1.4.1") }
tlMimaPreviousVersions ~= { old =>
old -- Set("1.4.1")
}
))

0 comments on commit c701a06

Please sign in to comment.