Skip to content

Commit

Permalink
Merge branch 'series/0.1' into update/slf4j-simple-2.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist authored Oct 16, 2022
2 parents 538cdc7 + eca24c3 commit 30e28a6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.16, 2.13.8, 3.1.3]
scala: [2.12.16, 2.13.8, 3.2.0]
java: [temurin@8]
project: [rootJS, rootJVM, rootNative]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -211,32 +211,32 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.1.3, rootJS)
- name: Download target directories (3.2.0, rootJS)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootJS

- name: Inflate target directories (3.1.3, rootJS)
- name: Inflate target directories (3.2.0, rootJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.1.3, rootJVM)
- name: Download target directories (3.2.0, rootJVM)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootJVM

- name: Inflate target directories (3.1.3, rootJVM)
- name: Inflate target directories (3.2.0, rootJVM)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.1.3, rootNative)
- name: Download target directories (3.2.0, rootNative)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.3-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootNative

- name: Inflate target directories (3.1.3, rootNative)
- name: Inflate target directories (3.2.0, rootNative)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ThisBuild / tlBaseVersion := "0.1"

val scala212Version = "2.12.16"
val scala213Version = "2.13.8"
val scala30Version = "3.1.3"
val scala30Version = "3.2.0"

val collectionCompatVersion = "2.8.1"

Expand Down Expand Up @@ -158,7 +158,7 @@ lazy val lightstepGrpc = project
description := "Lightstep gRPC bindings for Natchez.",
libraryDependencies ++= Seq(
"com.lightstep.tracer" % "tracer-grpc" % "0.30.3",
"io.grpc" % "grpc-netty" % "1.49.0",
"io.grpc" % "grpc-netty" % "1.49.2",
"io.netty" % "netty-tcnative-boringssl-static" % "2.0.54.Final"
),
mimaPreviousArtifacts := Set()
Expand Down Expand Up @@ -204,7 +204,7 @@ lazy val opentelemetry = project
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.1.7").toMap,
libraryDependencies ++= Seq(
"org.scala-lang.modules" %% "scala-collection-compat" % collectionCompatVersion,
"io.opentelemetry" % "opentelemetry-sdk" % "1.12.0"
"io.opentelemetry" % "opentelemetry-sdk" % "1.19.0"
)
)

Expand Down Expand Up @@ -294,8 +294,8 @@ lazy val xray = crossProject(JSPlatform, JVMPlatform)
description := "AWS X-Ray bindings implementation",
libraryDependencies ++= Seq(
"io.circe" %%% "circe-core" % "0.14.3",
"co.fs2" %%% "fs2-io" % "3.2.14",
"com.comcast" %%% "ip4s-core" % "3.1.3",
"co.fs2" %%% "fs2-io" % "3.3.0",
"com.comcast" %%% "ip4s-core" % "3.2.0",
"org.scodec" %%% "scodec-bits" % "1.1.34"
)
)
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.15")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.16")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.3")

0 comments on commit 30e28a6

Please sign in to comment.