Skip to content

Commit 6639b1b

Browse files
authored
Merge branch 'main' into update/java-dogstatsd-client-4.4.3
2 parents 6128bdc + a397135 commit 6639b1b

File tree

6 files changed

+33
-24
lines changed

6 files changed

+33
-24
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ concurrency:
2424

2525
jobs:
2626
build:
27-
name: Build and Test
27+
name: Test
2828
strategy:
2929
matrix:
30-
os: [ubuntu-latest]
30+
os: [ubuntu-22.04]
3131
scala: [3, 2.13, 2.12]
3232
java: [temurin@17, temurin@11]
3333
exclude:
@@ -43,6 +43,9 @@ jobs:
4343
with:
4444
fetch-depth: 0
4545

46+
- name: Setup sbt
47+
uses: sbt/setup-sbt@v1
48+
4649
- name: Setup Java (temurin@17)
4750
id: setup-java-temurin-17
4851
if: matrix.java == 'temurin@17'
@@ -73,18 +76,18 @@ jobs:
7376
run: sbt githubWorkflowCheck
7477

7578
- name: Check headers and formatting
76-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
79+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
7780
run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
7881

7982
- name: Test
8083
run: sbt '++ ${{ matrix.scala }}' test
8184

8285
- name: Check binary compatibility
83-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
86+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
8487
run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
8588

8689
- name: Generate API documentation
87-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
90+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
8891
run: sbt '++ ${{ matrix.scala }}' doc
8992

9093
- name: Make target directories
@@ -108,7 +111,7 @@ jobs:
108111
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
109112
strategy:
110113
matrix:
111-
os: [ubuntu-latest]
114+
os: [ubuntu-22.04]
112115
java: [temurin@17]
113116
runs-on: ${{ matrix.os }}
114117
steps:
@@ -117,6 +120,9 @@ jobs:
117120
with:
118121
fetch-depth: 0
119122

123+
- name: Setup sbt
124+
uses: sbt/setup-sbt@v1
125+
120126
- name: Setup Java (temurin@17)
121127
id: setup-java-temurin-17
122128
if: matrix.java == 'temurin@17'
@@ -199,10 +205,10 @@ jobs:
199205

200206
dependency-submission:
201207
name: Submit Dependencies
202-
if: github.event_name != 'pull_request'
208+
if: github.event.repository.fork == false && github.event_name != 'pull_request'
203209
strategy:
204210
matrix:
205-
os: [ubuntu-latest]
211+
os: [ubuntu-22.04]
206212
java: [temurin@17]
207213
runs-on: ${{ matrix.os }}
208214
steps:
@@ -211,6 +217,9 @@ jobs:
211217
with:
212218
fetch-depth: 0
213219

220+
- name: Setup sbt
221+
uses: sbt/setup-sbt@v1
222+
214223
- name: Setup Java (temurin@17)
215224
id: setup-java-temurin-17
216225
if: matrix.java == 'temurin@17'
@@ -246,7 +255,7 @@ jobs:
246255
name: Validate Steward Config
247256
strategy:
248257
matrix:
249-
os: [ubuntu-latest]
258+
os: [ubuntu-22.04]
250259
java: [temurin@11]
251260
runs-on: ${{ matrix.os }}
252261
steps:

.scalafmt.conf

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

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ ThisBuild / developers := List(
2020
)
2121

2222
// scala versions
23-
val scala3 = "3.3.3"
24-
val scala213 = "2.13.13"
25-
val scala212 = "2.12.19"
23+
val scala3 = "3.3.5"
24+
val scala213 = "2.13.16"
25+
val scala212 = "2.12.20"
2626
val defaultScala = scala3
2727

2828
// github actions

project/Dependencies.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ object Dependencies {
44

55
object Versions {
66
val Datadog = "4.4.3"
7-
val Dropwizard = "4.2.25"
7+
val Dropwizard = "4.2.30"
88
val DropwizardV5 = "5.0.0"
9-
val Enumeratum = "1.7.3"
10-
val Logback = "1.5.4"
11-
val Pekko = "1.0.2"
12-
val PekkoHttp = "1.0.1"
9+
val Enumeratum = "1.7.5"
10+
val Logback = "1.5.17"
11+
val Pekko = "1.1.3"
12+
val PekkoHttp = "1.1.0"
1313
val Prometheus = "0.16.0"
14-
val ScalaCollectionCompat = "2.11.0"
14+
val ScalaCollectionCompat = "2.13.0"
1515
val ScalaLogging = "3.9.5"
1616
val ScalaMock = "6.0.0-M2"
17-
val ScalaTest = "3.2.18"
17+
val ScalaTest = "3.2.19"
1818
}
1919

2020
val Datadog = "com.datadoghq" % "java-dogstatsd-client" % Versions.Datadog

project/build.properties

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

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7")
2-
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.6.7")
3-
addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.6.7")
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")

0 commit comments

Comments
 (0)