diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b229aa956..d945d5e7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -256,19 +256,19 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - java: [temurin@11] + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (fast) uses: actions/checkout@v6 - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 + if: matrix.java == 'temurin@17' uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - uses: coursier/setup-action@v1 with: diff --git a/oteljava/logs-testkit/src/main/scala/org/typelevel/otel4s/oteljava/testkit/logs/LogsTestkit.scala b/oteljava/logs-testkit/src/main/scala/org/typelevel/otel4s/oteljava/testkit/logs/LogsTestkit.scala index 5667a5cbf..6da43e9a4 100644 --- a/oteljava/logs-testkit/src/main/scala/org/typelevel/otel4s/oteljava/testkit/logs/LogsTestkit.scala +++ b/oteljava/logs-testkit/src/main/scala/org/typelevel/otel4s/oteljava/testkit/logs/LogsTestkit.scala @@ -23,8 +23,8 @@ import io.opentelemetry.sdk.logs.LogRecordProcessor import io.opentelemetry.sdk.logs.SdkLoggerProvider import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder import io.opentelemetry.sdk.logs.data.LogRecordData -import io.opentelemetry.sdk.logs.`export`.LogRecordExporter -import io.opentelemetry.sdk.logs.`export`.SimpleLogRecordProcessor +import io.opentelemetry.sdk.logs.export.LogRecordExporter +import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter import org.typelevel.otel4s.context.LocalProvider import org.typelevel.otel4s.logs.LoggerProvider diff --git a/oteljava/trace-testkit/src/main/scala/org/typelevel/otel4s/oteljava/testkit/trace/TracesTestkit.scala b/oteljava/trace-testkit/src/main/scala/org/typelevel/otel4s/oteljava/testkit/trace/TracesTestkit.scala index b02b25df6..feddc1742 100644 --- a/oteljava/trace-testkit/src/main/scala/org/typelevel/otel4s/oteljava/testkit/trace/TracesTestkit.scala +++ b/oteljava/trace-testkit/src/main/scala/org/typelevel/otel4s/oteljava/testkit/trace/TracesTestkit.scala @@ -27,8 +27,8 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder import io.opentelemetry.sdk.trace.SpanProcessor import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.sdk.trace.`export`.SimpleSpanProcessor -import io.opentelemetry.sdk.trace.`export`.SpanExporter +import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor +import io.opentelemetry.sdk.trace.export.SpanExporter import org.typelevel.otel4s.context.LocalProvider import org.typelevel.otel4s.context.propagation.ContextPropagators import org.typelevel.otel4s.oteljava.context.Context diff --git a/project/plugins.sbt b/project/plugins.sbt index 5740cadb1..e9fd203c4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.6") -addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.8.6") -addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.8.6") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.6") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.7") +addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.8.7") +addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.8.7") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.12") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")