Skip to content

Commit

Permalink
Merge pull request #2385 from scalacenter/update/scalafmt-core-3.8.3
Browse files Browse the repository at this point in the history
build(deps): Update scalafmt-core from 3.8.2 to 3.8.3
  • Loading branch information
tgodzik authored Jul 26, 2024
2 parents 4e6da1e + 3bfe557 commit a9e52c3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@

# Scala Steward: Reformat with scalafmt 3.7.0
938cf56606b4900cbd7679725441fbbbe979bcaf

# Scala Steward: Reformat with scalafmt 3.8.3
6c9a11a61850da8d41d9b15d9bd8d4076eed8d81
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.3"
runner.dialect = scala213
maxColumn = 100
docstrings.style = Asterisk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -788,14 +788,14 @@ object BloopDefaults {
lazy val javaRuntimeHome = (Runtime / Keys.javaHome).value.map(_.toPath())
lazy val javaRuntimeOptions = (Runtime / Keys.javaOptions).value
val config = Config.JvmConfig(Some(javaHome.toPath), (extraJavaOptions ++ javaOptions).toList)
lazy val configRuntime =
lazy val configRuntime =
Config.JvmConfig(javaRuntimeHome.orElse(Some(javaHome.toPath)), (extraJavaOptions ++ javaRuntimeOptions).toList)
/* Runtime config is only used for run task, which is in Compile scope normally.
* Test classpath already contains runtime config, so it's not needed to set separate classpath for test scope.
*/
if (configuration == Compile)
Config.Platform.Jvm(config, mainClass, Some(configRuntime), Some(runtimeClasspath), None)
else
else
Config.Platform.Jvm(config, mainClass, None, None, None)
}
}
Expand Down

0 comments on commit a9e52c3

Please sign in to comment.