Skip to content

Commit

Permalink
Updating dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Sjoerd Mulder committed Mar 20, 2024
1 parent 8509bf5 commit 3278051
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 42 deletions.
37 changes: 10 additions & 27 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,28 +1,11 @@
style = defaultWithAlign
preset = defaultWithAlign
//@formatter on
align {
tokens = [
{code = "=>", owner = "Case"}
{code = "extends", owner = "Defn.(Class|Trait|Object)"}
{code = "//", owner = ".*"}
{code = "{", owner = "Template"}
{code = "}", owner = "Template"}
{code = "%", owner = "Term.ApplyInfix"}
{code = "%%", owner = "Term.ApplyInfix"}
{code = "%%%", owner = "Term.ApplyInfix"}
{code = "⇒", owner = "Case"}
{code = "<-", owner = "Enumerator.Generator"}
{code = "←", owner = "Enumerator.Generator"}
{code = "->", owner = "Term.ApplyInfix"}
{code = "→", owner = "Term.ApplyInfix"}
{code = "=", owner = "(Enumerator.Val|Defn.(Va(l|r)|Def|Type))"}
]
}
danglingParentheses = true
docstrings = JavaDoc
indentOperator = spray
maxColumn = 120
rewrite.rules = [RedundantBraces, RedundantParens, SortImports]
unindentTopLevelOperators = true
project.git = true
newlines.alwaysBeforeTopLevelStatements = true
version = 3.7.17
runner.dialect = scala3
align.preset = more
danglingParentheses.preset = true
docstrings.style = Asterisk
indentOperator.preset = spray
maxColumn = 120
rewrite.rules = [RedundantBraces, RedundantParens, SortImports]
project.git = true
12 changes: 5 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import Build.*

// Scala Formatting
ThisBuild / scalafmtVersion := "1.5.1"
ThisBuild / scalafmtOnCompile := false // all projects
ThisBuild / scalafmtTestOnCompile := false // all projects

releaseCrossBuild := true

sonatypeProfileName := "com.crobox"
Expand Down Expand Up @@ -66,7 +61,7 @@ lazy val client: Project = (project in file("client"))
"org.apache.pekko" %% "pekko-stream" % PekkoVersion,
"org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
"joda-time" % "joda-time" % "2.12.5"
"joda-time" % "joda-time" % "2.12.7"
) ++ Seq("org.apache.pekko" %% "pekko-testkit" % PekkoVersion % Test) ++ Build.testDependencies.map(_ % Test)
)

Expand All @@ -77,7 +72,10 @@ lazy val dsl = (project in file("dsl"))
.settings(
name := "dsl",
sbtrelease.ReleasePlugin.autoImport.releasePublishArtifactsAction := PgpKeys.publishSigned.value,
libraryDependencies ++= Seq("com.google.guava" % "guava" % "23.0", "com.typesafe" % "config" % "1.4.2")
libraryDependencies ++= Seq(
"com.google.guava" % "guava" % "33.1.0-jre",
"com.typesafe" % "config" % "1.4.3"
)
)
// .settings(excludeDependencies ++= Seq(ExclusionRule("org.apache.pekko")))

Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ object Build {
val PekkoVersion = "1.0.2"
val PekkoHttpVersion = "1.0.1"

val testDependencies = Seq("org.scalatest" %% "scalatest" % "3.2.15", "ch.qos.logback" % "logback-classic" % "1.4.7")
val testDependencies = Seq("org.scalatest" %% "scalatest" % "3.2.18", "ch.qos.logback" % "logback-classic" % "1.4.7")
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.6
sbt.version=1.9.8
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.4")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "1.1.5-SNAPSHOT"
ThisBuild / version := "1.1.5-SNAPSHOT"

0 comments on commit 3278051

Please sign in to comment.