Skip to content
This repository was archived by the owner on Feb 24, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.7.1
e08f3b0e71ece223ee8d2c3605c8d82761d21682
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.4.3"
version = "3.7.1"

preset = "defaultWithAlign"
runner.dialect = "scala213source3"
Expand Down
11 changes: 9 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
)
6 changes: 3 additions & 3 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
@@ -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

Expand Down
29 changes: 19 additions & 10 deletions project/CommonSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
6 changes: 3 additions & 3 deletions project/Publish.scala
Original file line number Diff line number Diff line change
@@ -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

Expand Down