Skip to content

Commit

Permalink
Update scalafmt-core to 3.7.14 (#282)
Browse files Browse the repository at this point in the history
* Update scalafmt-core to 3.7.14

* Reformat with scalafmt 3.7.14

Executed command: scalafmt --non-interactive

* Add 'Reformat with scalafmt 3.7.14' to .git-blame-ignore-revs

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jules Ivanic <guizmaii@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and guizmaii authored Sep 19, 2023
1 parent f94caa4 commit acb6a31
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.0.8
1b6e10ffeb6a994c3fe28b8ff87188bb17d29b82

# Scala Steward: Reformat with scalafmt 3.7.14
f4253372ca2a606e879081470b19e1832c43ac51
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.0.8"
version = "3.7.14"
maxColumn = 120
align.preset = most
align.multiline = false
Expand Down
7 changes: 3 additions & 4 deletions zio-sbt-ci/src/main/scala/zio/sbt/ZioSbtCiPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ object ZioSbtCiPlugin extends AutoPlugin {
val GroupTests = {
def makeTests(scalaVersion: String) =
s" ${scalaVersionMatrix.filter { case (_, versions) =>
versions.contains(scalaVersion)
}.map(e => e._1 + "/test").mkString(" ")}"
versions.contains(scalaVersion)
}.map(e => e._1 + "/test").mkString(" ")}"

Job(
id = "test",
Expand Down Expand Up @@ -561,7 +561,7 @@ object ZioSbtCiPlugin extends AutoPlugin {
IO.write(new File(s".github/workflows/${ciWorkflowName.value.toLowerCase}.yml"), template)
}

override lazy val buildSettings: Seq[Setting[_]] = {
override lazy val buildSettings: Seq[Setting[_]] =
Seq(
ciWorkflowName := "CI",
ciEnabledBranches := Seq.empty,
Expand Down Expand Up @@ -613,7 +613,6 @@ object ZioSbtCiPlugin extends AutoPlugin {
}.value,
ciReleaseApprovalJobs := Seq("ci")
)
}

abstract class DocsVersioning(val npmCommand: String)
object DocsVersioning {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ object ZioSbtEcosystemPlugin extends AutoPlugin {
s"""|${Banner.trueColor(s"${name.value} v.${version.value}")}
|Useful sbt tasks:
|${usefulTasksAndSettings.value.map { case (task, description) =>
s"${item(task)} ${normalizedPadding(task)}${description}"
}
.mkString("\n")}
s"${item(task)} ${normalizedPadding(task)}${description}"
}
.mkString("\n")}
""".stripMargin

} else ""
Expand Down
3 changes: 1 addition & 2 deletions zio-sbt-website/src/main/scala/zio/sbt/WebsitePlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ object WebsitePlugin extends sbt.AutoPlugin {
}
}

lazy val generateReadmeTask: Def.Initialize[Task[Unit]] = {
lazy val generateReadmeTask: Def.Initialize[Task[Unit]] =
Def.task {
import zio.*

Expand Down Expand Up @@ -374,7 +374,6 @@ object WebsitePlugin extends sbt.AutoPlugin {

logger.info("The new README.md file generated")
}
}

lazy val checkReadmeTask: Def.Initialize[Task[Unit]] =
Def.task {
Expand Down
9 changes: 5 additions & 4 deletions zio-sbt-website/src/main/scala/zio/sbt/WebsiteUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,11 @@ object WebsiteUtils {
}

def releaseVersion(logger: String => Unit): Option[String] =
try "git tag --sort=committerdate".!!.split("\n")
.filter(_.startsWith("v"))
.lastOption
.map(_.tail) // without the leading v char
try
"git tag --sort=committerdate".!!.split("\n")
.filter(_.startsWith("v"))
.lastOption
.map(_.tail) // without the leading v char
catch {
case _: Exception =>
logger(
Expand Down

0 comments on commit acb6a31

Please sign in to comment.