Skip to content

Commit 8b3dd5a

Browse files
authored
Merge branch 'main' into update/pekko-slf4j-1.1.4
2 parents 031847b + d2290f9 commit 8b3dd5a

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.9.4
1+
version = 3.9.7
22
project.git = true # only format files tracked by git
33
maxColumn = 120
44
runner.dialect = scala3

build.sbt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ val username = "RustedBones"
33
val repo = "pekko-http-metrics"
44
val githubUrl = s"https://github.com/$username/$repo"
55

6-
ThisBuild / tlBaseVersion := "2.0"
7-
ThisBuild / organization := "fr.davit"
8-
ThisBuild / organizationName := "Michel Davit"
9-
ThisBuild / startYear := Some(2019)
10-
ThisBuild / licenses := Seq(License.Apache2)
11-
ThisBuild / homepage := Some(url(githubUrl))
12-
ThisBuild / scmInfo := Some(ScmInfo(url(githubUrl), s"[email protected]:$username/$repo.git"))
13-
ThisBuild / sonatypeCredentialHost := xerial.sbt.Sonatype.sonatypeLegacy
14-
ThisBuild / developers := List(
6+
ThisBuild / tlBaseVersion := "2.0"
7+
ThisBuild / organization := "fr.davit"
8+
ThisBuild / organizationName := "Michel Davit"
9+
ThisBuild / startYear := Some(2019)
10+
ThisBuild / licenses := Seq(License.Apache2)
11+
ThisBuild / homepage := Some(url(githubUrl))
12+
ThisBuild / scmInfo := Some(ScmInfo(url(githubUrl), s"[email protected]:$username/$repo.git"))
13+
ThisBuild / developers := List(
1514
Developer(
1615
id = s"$username",
1716
name = "Michel Davit",

project/Dependencies.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import sbt._
33
object Dependencies {
44

55
object Versions {
6-
val Datadog = "4.4.3"
6+
val Datadog = "4.4.4"
77
val Dropwizard = "4.2.30"
88
val DropwizardV5 = "5.0.0"
9-
val Enumeratum = "1.7.5"
10-
val Logback = "1.5.17"
9+
val Enumeratum = "1.7.6"
10+
val Logback = "1.5.18"
1111
val Pekko = "1.1.4"
12-
val PekkoHttp = "1.1.0"
12+
val PekkoHttp = "1.2.0"
1313
val Prometheus = "1.3.6"
1414
val ScalaCollectionCompat = "2.13.0"
1515
val ScalaLogging = "3.9.5"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.10
1+
sbt.version=1.11.2

project/plugins.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7")
2-
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.7")
3-
addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.7")
1+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.0")

0 commit comments

Comments
 (0)