diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index bcc70b8..279cdb8 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.5.9 bd0f775f69460068c0b6ec3652a9b5414f891400 + +# Scala Steward: Reformat with scalafmt 3.8.2 +64db54152961ec0bd8b72c6f40d1d36a25c71b53 diff --git a/.scalafmt.conf b/.scalafmt.conf index 4dcfc1b..84a31bd 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -2,7 +2,7 @@ binPack.parentConstructors = true maxColumn = 120 includeCurlyBraceInSelectChains = false align.preset = most -version = "3.5.9" +version = "3.8.2" trailingCommas = preserve newlines.penalizeSingleSelectMultiArgList = false newlines.alwaysBeforeMultilineDef = false diff --git a/ci-release.sbt b/ci-release.sbt index af6518c..b879855 100644 --- a/ci-release.sbt +++ b/ci-release.sbt @@ -9,7 +9,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq( RefPredicate.StartsWith(Ref.Tag("v")) ) -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) ThisBuild / githubWorkflowBuildPreamble += WorkflowStep.Sbt( List("scalafmtCheckAll", "scalafmtSbtCheck"), @@ -31,7 +31,7 @@ ThisBuild / githubWorkflowPublish := Seq( ThisBuild / licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")) -ThisBuild / developers := List( +ThisBuild / developers := List( Developer("KS2003", "Yana Karpysheva", "karpyshev03@mail.ru", url("https://github.com/KS2003")), Developer( "mikhailchuryakov", @@ -45,14 +45,14 @@ ThisBuild / developers := List( Developer("skye17", "Anastasiya Ermolaeva", "a.ermolaeva@tinkoff.ru", url("https://github.com/skye17")) ) -ThisBuild / organization := "tf.tofu" -ThisBuild / organizationName := "Tofu" +ThisBuild / organization := "tf.tofu" +ThisBuild / organizationName := "Tofu" ThisBuild / homepage := Some(url("https://github.com/tf-tofu/cherry")) ThisBuild / description := "Universal Data design and transform language core" -ThisBuild / scmInfo := Some( +ThisBuild / scmInfo := Some( ScmInfo( url("https://github.com/tofu-tf/cherry"), "git@github.com:tofu-tf/cherry.git"