diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..6742cac --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.1 +e08f3b0e71ece223ee8d2c3605c8d82761d21682 diff --git a/.scalafmt.conf b/.scalafmt.conf index 465c52c..a7b3949 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.4.3" +version = "3.7.1" preset = "defaultWithAlign" runner.dialect = "scala213source3" diff --git a/build.sbt b/build.sbt index cda9dcd..2e75857 100644 --- a/build.sbt +++ b/build.sbt @@ -26,10 +26,17 @@ lazy val proto_test: Project = project .settings( libraryDependencies ++= Seq( // scalapb - "com.thesamet.scalapb" %% "scalapb-runtime" % scalapbVersion % "protobuf"), + "com.thesamet.scalapb" %% "scalapb-runtime" % scalapbVersion % "protobuf" + ), name := "protogen", Test / PB.protoSources ++= Seq(file("proto")), Test / PB.includePaths ++= Seq(file("proto/test")), Test / PB.targets := Seq( scalapb - .gen(flatPackage = false, javaConversions = false, grpc = true) -> (Test / sourceManaged).value / "scalapb")) + .gen( + flatPackage = false, + javaConversions = false, + grpc = true + ) -> (Test / sourceManaged).value / "scalapb" + ) + ) diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index d96b671..5cd8a6a 100644 --- a/project/BuildSettings.scala +++ b/project/BuildSettings.scala @@ -1,9 +1,9 @@ -import sbt.{ plugins, AutoPlugin, Plugins } +import sbt.{ AutoPlugin, Plugins, plugins } import sbt.Keys.{ dependencyOverrides, libraryDependencies } /** - * Dependencies that will be used by any lagompb based project - */ + * Dependencies that will be used by any lagompb based project + */ object BuildSettings extends AutoPlugin { override def requires: Plugins = plugins.JvmPlugin diff --git a/project/CommonSettings.scala b/project/CommonSettings.scala index 606530e..d25f720 100644 --- a/project/CommonSettings.scala +++ b/project/CommonSettings.scala @@ -9,31 +9,40 @@ object CommonSettings extends AutoPlugin { override def globalSettings = Seq( - scalaVersion := Versions.Scala213, - organization := "io.superflat", - organizationName := "Super Flat", - startYear := Some(2020), + scalaVersion := Versions.Scala213, + organization := "io.superflat", + organizationName := "Super Flat", + startYear := Some(2020), organizationHomepage := Some(url("https://superflat.io/")), - homepage := Some(url("https://github.com/super-flat/scala-otel-tools")), + homepage := Some(url("https://github.com/super-flat/scala-otel-tools")), scmInfo := Some( ScmInfo( url("https://github.com/super-flat/scala-otel-tools"), - "git@github.com:super-flat/scala-otel-tools.git")), + "git@github.com:super-flat/scala-otel-tools.git" + ) + ), licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), developers += Developer( "contributors", "Contributors", "", - url("https://github.com/super-flat/scala-otel-tools/graphs/contributors")), - description := "scala-otel-tools - Scala shared code for telemetry.\n") + url("https://github.com/super-flat/scala-otel-tools/graphs/contributors") + ), + description := "scala-otel-tools - Scala shared code for telemetry.\n" + ) override def projectSettings = Seq( scalacOptions ++= Seq("-Xfatal-warnings", "-deprecation", "-Xlint"), - resolvers ++= Seq(Resolver.jcenterRepo, Resolver.sonatypeRepo("public"), Resolver.sonatypeRepo("snapshots")), + resolvers ++= Seq( + Resolver.jcenterRepo, + Resolver.sonatypeRepo("public"), + Resolver.sonatypeRepo("snapshots") + ), scalafmtOnCompile := true, // show full stack traces and test case durations Test / testOptions += Tests.Argument("-oDF"), Test / logBuffered := false, - Test / fork := true) + Test / fork := true + ) } diff --git a/project/Publish.scala b/project/Publish.scala index 4f9b551..05a1916 100644 --- a/project/Publish.scala +++ b/project/Publish.scala @@ -1,9 +1,9 @@ import sbt.Keys.{ publishArtifact, skip, _ } -import sbt.{ plugins, AutoPlugin, _ } +import sbt.{ AutoPlugin, plugins, _ } /** - * For projects that are not to be published. - */ + * For projects that are not to be published. + */ object NoPublish extends AutoPlugin { override def requires: Plugins = plugins.JvmPlugin