Skip to content

Commit e3d4ed6

Browse files
committed
Update to latest otel4s snapshots
2 parents 715537c + b95bbe5 commit e3d4ed6

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
timeout-minutes: 60
3636
steps:
3737
- name: Checkout current branch (full)
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939
with:
4040
fetch-depth: 0
4141

@@ -117,7 +117,7 @@ jobs:
117117
runs-on: ${{ matrix.os }}
118118
steps:
119119
- name: Checkout current branch (full)
120-
uses: actions/checkout@v5
120+
uses: actions/checkout@v6
121121
with:
122122
fetch-depth: 0
123123

@@ -237,7 +237,7 @@ jobs:
237237
runs-on: ${{ matrix.os }}
238238
steps:
239239
- name: Checkout current branch (full)
240-
uses: actions/checkout@v5
240+
uses: actions/checkout@v6
241241
with:
242242
fetch-depth: 0
243243

@@ -278,7 +278,7 @@ jobs:
278278
runs-on: ${{ matrix.os }}
279279
steps:
280280
- name: Checkout current branch (full)
281-
uses: actions/checkout@v5
281+
uses: actions/checkout@v6
282282
with:
283283
fetch-depth: 0
284284

@@ -324,7 +324,7 @@ jobs:
324324
runs-on: ${{ matrix.os }}
325325
steps:
326326
- name: Checkout current branch (full)
327-
uses: actions/checkout@v5
327+
uses: actions/checkout@v6
328328
with:
329329
fetch-depth: 0
330330

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version = "3.10.2"
1+
version = "3.10.4"
22
runner.dialect = Scala213Source3
33
project.includePaths = [] # disables formatting

build.sbt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,16 @@ ThisBuild / libraryDependencySchemes +=
6666
// This is used in a couple places
6767
lazy val fs2Version = "3.13.0-M8"
6868
lazy val openTelemetryVersion = "1.55.0"
69-
lazy val otel4sVersion = "0.14-eadbb3d-SNAPSHOT"
69+
lazy val otel4sVersion = "0.15-ca28b04-SNAPSHOT"
70+
lazy val otel4sSdkVersion = "0.15-f5df7b3-SNAPSHOT"
7071
lazy val refinedVersion = "0.11.3"
7172

7273
// Global Settings
7374
lazy val commonSettings = Seq(
7475

76+
// Resolvers
77+
resolvers += Resolver.sonatypeCentralSnapshots,
78+
7579
// Headers
7680
headerMappings := headerMappings.value + (HeaderFileType.scala -> HeaderCommentStyle.cppStyleLineComment),
7781
headerLicense := Some(HeaderLicense.Custom(
@@ -191,8 +195,8 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
191195
"org.typelevel" %%% "discipline-munit" % "2.0.0",
192196
"org.typelevel" %%% "cats-time" % "0.6.0",
193197
"eu.timepit" %%% "refined-cats" % refinedVersion,
194-
"org.typelevel" %%% "otel4s-sdk-trace" % otel4sVersion,
195-
"org.typelevel" %%% "otel4s-sdk-exporter-trace" % otel4sVersion,
198+
"org.typelevel" %%% "otel4s-sdk-trace" % otel4sSdkVersion,
199+
"org.typelevel" %%% "otel4s-sdk-exporter-trace" % otel4sSdkVersion,
196200
),
197201
testFrameworks += new TestFramework("munit.Framework"),
198202
testOptions += {

project/build.properties

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

project/plugins.sbt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ ThisBuild / libraryDependencySchemes ++= Seq(
33
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
44
)
55

6-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.3")
7-
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.3")
6+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.4")
7+
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.4")
88
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
99
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
10-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.3")
11-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
10+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
11+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.2")
1212
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9")
1313
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.4.0")
14+
15+
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.1") // TODO: Remove once this is merged and released: https://github.com/typelevel/sbt-typelevel/pull/862

0 commit comments

Comments
 (0)