diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8eb531711..9a83fa54d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,56 +15,42 @@ on: tags: [v*] env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +concurrency: + group: ${{ github.workflow }} @ ${{ github.ref }} + cancel-in-progress: true + jobs: build: name: Build and Test strategy: matrix: os: [ubuntu-latest] - scala: [2.13.11, 3.3.0] + scala: [2.13, 3] java: [temurin@8] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 - if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 8 - - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - name: Check that workflows are up to date run: sbt githubWorkflowCheck @@ -73,6 +59,10 @@ jobs: if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck + - name: Check scalafix lints + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check' + - name: scalaJSLink if: matrix.project == 'rootJS' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult @@ -84,10 +74,6 @@ jobs: - name: Test run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - - name: Check scalafix lints - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' - run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check' - - name: Check binary compatibility if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues @@ -98,11 +84,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: mkdir -p testkit/metrics/jvm/target java/metrics/target testkit/common/jvm/target sdk/common/.native/target benchmarks/target examples/target sdk/common/.js/target core/trace/.js/target target semconv/.jvm/target core/common/.jvm/target java/trace/target unidocs/target .js/target core/metrics/.native/target core/all/.native/target site/target core/metrics/.jvm/target core/all/.js/target java/all/target java/common/target core/metrics/.js/target core/all/.jvm/target sdk/common/.jvm/target .jvm/target core/trace/.native/target .native/target semconv/.js/target core/trace/.jvm/target core/common/.native/target core/common/.js/target semconv/.native/target testkit/all/jvm/target project/target + run: mkdir -p testkit/metrics/jvm/target java/metrics/target testkit/common/jvm/target core/trace/.js/target semconv/.jvm/target core/common/.jvm/target java/trace/target unidocs/target core/metrics/.native/target core/all/.native/target core/metrics/.jvm/target core/all/.js/target java/all/target java/common/target core/metrics/.js/target core/all/.jvm/target core/trace/.native/target semconv/.js/target core/trace/.jvm/target core/common/.native/target core/common/.js/target semconv/.native/target testkit/all/jvm/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: tar cf targets.tar testkit/metrics/jvm/target java/metrics/target testkit/common/jvm/target sdk/common/.native/target benchmarks/target examples/target sdk/common/.js/target core/trace/.js/target target semconv/.jvm/target core/common/.jvm/target java/trace/target unidocs/target .js/target core/metrics/.native/target core/all/.native/target site/target core/metrics/.jvm/target core/all/.js/target java/all/target java/common/target core/metrics/.js/target core/all/.jvm/target sdk/common/.jvm/target .jvm/target core/trace/.native/target .native/target semconv/.js/target core/trace/.jvm/target core/common/.native/target core/common/.js/target semconv/.native/target testkit/all/jvm/target project/target + run: tar cf targets.tar testkit/metrics/jvm/target java/metrics/target testkit/common/jvm/target core/trace/.js/target semconv/.jvm/target core/common/.jvm/target java/trace/target unidocs/target core/metrics/.native/target core/all/.native/target core/metrics/.jvm/target core/all/.js/target java/all/target java/common/target core/metrics/.js/target core/all/.jvm/target core/trace/.native/target semconv/.js/target core/trace/.jvm/target core/common/.native/target core/common/.js/target semconv/.native/target testkit/all/jvm/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') @@ -126,110 +112,106 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 - if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 8 - - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - - name: Download target directories (2.13.11, rootJS) + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update + + - name: Download target directories (2.13, rootJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS - - name: Inflate target directories (2.13.11, rootJS) + - name: Inflate target directories (2.13, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.11, rootJVM) + - name: Download target directories (2.13, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM - - name: Inflate target directories (2.13.11, rootJVM) + - name: Inflate target directories (2.13, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.11, rootNative) + - name: Download target directories (2.13, rootNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative - - name: Inflate target directories (2.13.11, rootNative) + - name: Inflate target directories (2.13, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0, rootJS) + - name: Download target directories (3, rootJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS - - name: Inflate target directories (3.3.0, rootJS) + - name: Inflate target directories (3, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0, rootJVM) + - name: Download target directories (3, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM - - name: Inflate target directories (3.3.0, rootJVM) + - name: Inflate target directories (3, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0, rootNative) + - name: Download target directories (3, rootNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative - - name: Inflate target directories (3.3.0, rootNative) + - name: Inflate target directories (3, rootNative) run: | tar xf targets.tar rm targets.tar - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: echo $PGP_SECRET | base64 -di | gpg --import - name: Import signing key and strip passphrase if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: | echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) - name: Publish + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} run: sbt tlCiRelease - site: - name: Generate Site + dependency-submission: + name: Submit Dependencies + if: github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] @@ -241,40 +223,57 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 8 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: otel4s-sdk-common_native0.4_2.13 otel4s-sdk-common_native0.4_3 otel4s-benchmarks_2.13 otel4s-benchmarks_3 otel4s-examples_2.13 otel4s-examples_3 otel4s-sdk-common_sjs1_2.13 otel4s-sdk-common_sjs1_3 otel4s_2.13 otel4s_3 docs_2.13 docs_3 otel4s-sdk-common_2.13 otel4s-sdk-common_3 otel4s_2.13 otel4s_3 otel4s_2.13 otel4s_3 + configs-ignore: test scala-tool scala-doc-tool test-internal + + site: + name: Generate Site + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - name: Generate site run: sbt docs/tlSite - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' - uses: peaceiris/actions-gh-pages@v3.9.0 + uses: peaceiris/actions-gh-pages@v3.9.3 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: site/target/docs/site diff --git a/benchmarks/src/main/scala/org/typelevel/otel4s/benchmarks/TraceBenchmark.scala b/benchmarks/src/main/scala/org/typelevel/otel4s/benchmarks/TraceBenchmark.scala index e14a8d442..5ee6335ed 100644 --- a/benchmarks/src/main/scala/org/typelevel/otel4s/benchmarks/TraceBenchmark.scala +++ b/benchmarks/src/main/scala/org/typelevel/otel4s/benchmarks/TraceBenchmark.scala @@ -36,7 +36,7 @@ class TraceBenchmark { import TraceBenchmark._ @Benchmark - def pure: Unit = + def pure(): Unit = IO.unit.unsafeRunSync() @Benchmark diff --git a/build.sbt b/build.sbt index c3c6fbfa8..376507f4b 100644 --- a/build.sbt +++ b/build.sbt @@ -17,13 +17,12 @@ ThisBuild / tlSonatypeUseLegacyHost := false // publish website from this branch ThisBuild / tlSitePublishBranch := Some("main") -ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0" -ThisBuild / semanticdbOptions ++= Seq("-P:semanticdb:synthetics:on").filter(_ => - !tlIsScala3.value +lazy val scalafixSettings = Seq( + semanticdbOptions ++= Seq("-P:semanticdb:synthetics:on").filter(_ => + !tlIsScala3.value + ) ) -ThisBuild / tlMimaPreviousVersions ~= (_.filterNot(_ == "0.2.0")) - val Scala213 = "2.13.11" ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.0") ThisBuild / scalaVersion := Scala213 // the default Scala @@ -92,6 +91,7 @@ lazy val `core-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform) "lgbt.princess" %%% "platform" % PlatformVersion % Test ) ) + .settings(scalafixSettings) lazy val `core-metrics` = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) @@ -106,6 +106,7 @@ lazy val `core-metrics` = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.typelevel" %%% "cats-effect-testkit" % CatsEffectVersion % Test ) ) + .settings(scalafixSettings) lazy val `core-trace` = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) @@ -120,6 +121,7 @@ lazy val `core-trace` = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.scodec" %%% "scodec-bits" % ScodecVersion ) ) + .settings(scalafixSettings) lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) @@ -128,6 +130,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( name := "otel4s-core" ) + .settings(scalafixSettings) lazy val `sdk-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) @@ -153,6 +156,7 @@ lazy val `sdk-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform) ) ) .settings(munitDependencies) + .settings(scalafixSettings) lazy val `testkit-common` = crossProject(JVMPlatform) .crossType(CrossType.Full) @@ -161,6 +165,7 @@ lazy val `testkit-common` = crossProject(JVMPlatform) .settings( name := "otel4s-testkit-common" ) + .settings(scalafixSettings) lazy val `testkit-metrics` = crossProject(JVMPlatform) .crossType(CrossType.Full) @@ -176,6 +181,7 @@ lazy val `testkit-metrics` = crossProject(JVMPlatform) "io.opentelemetry" % "opentelemetry-sdk-testing" % OpenTelemetryVersion ) ) + .settings(scalafixSettings) lazy val testkit = crossProject(JVMPlatform) .crossType(CrossType.Full) @@ -184,6 +190,7 @@ lazy val testkit = crossProject(JVMPlatform) .settings( name := "otel4s-testkit" ) + .settings(scalafixSettings) lazy val `java-common` = project .in(file("java/common")) @@ -206,6 +213,7 @@ lazy val `java-common` = project "openTelemetrySdkVersion" -> OpenTelemetryVersion ) ) + .settings(scalafixSettings) lazy val `java-metrics` = project .in(file("java/metrics")) @@ -217,6 +225,7 @@ lazy val `java-metrics` = project "io.opentelemetry" % "opentelemetry-sdk-testing" % OpenTelemetryVersion % Test ) ) + .settings(scalafixSettings) lazy val `java-trace` = project .in(file("java/trace")) @@ -251,6 +260,7 @@ lazy val `java-trace` = project ) ) ) + .settings(scalafixSettings) lazy val java = project .in(file("java/all")) @@ -262,6 +272,7 @@ lazy val java = project ) ) .settings(munitDependencies) + .settings(scalafixSettings) lazy val semconv = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) @@ -271,6 +282,7 @@ lazy val semconv = crossProject(JVMPlatform, JSPlatform, NativePlatform) name := "otel4s-semconv", startYear := Some(2023), ) + .settings(scalafixSettings) lazy val benchmarks = project .enablePlugins(NoPublishPlugin) @@ -280,6 +292,7 @@ lazy val benchmarks = project .settings( name := "otel4s-benchmarks" ) + .settings(scalafixSettings) lazy val examples = project .enablePlugins(NoPublishPlugin) @@ -300,6 +313,7 @@ lazy val examples = project "OTEL_SERVICE_NAME" -> "Trace Example" ) ) + .settings(scalafixSettings) lazy val docs = project .in(file("site")) diff --git a/java/all/src/test/scala/org/typelevel/otel4s/java/OtelJavaSuite.scala b/java/all/src/test/scala/org/typelevel/otel4s/java/OtelJavaSuite.scala index 2bcf38e01..53bf2b448 100644 --- a/java/all/src/test/scala/org/typelevel/otel4s/java/OtelJavaSuite.scala +++ b/java/all/src/test/scala/org/typelevel/otel4s/java/OtelJavaSuite.scala @@ -19,7 +19,6 @@ package org.typelevel.otel4s.java import cats.effect.IO import io.opentelemetry.sdk.{OpenTelemetrySdk => JOpenTelemetrySdk} import munit.CatsEffectSuite -import org.typelevel.otel4s.java.OtelJava class OtelJavaSuite extends CatsEffectSuite { diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/ObservableDoubleImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/ObservableDoubleImpl.scala index eeb589e7f..7a3e54366 100644 --- a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/ObservableDoubleImpl.scala +++ b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/ObservableDoubleImpl.scala @@ -20,7 +20,6 @@ package metrics import cats.effect.Sync import io.opentelemetry.api.metrics.ObservableDoubleMeasurement -import org.typelevel.otel4s.Attribute import org.typelevel.otel4s.metrics._ private[java] class ObservableDoubleImpl[F[_]]( diff --git a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/ObservableLongImpl.scala b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/ObservableLongImpl.scala index 3ebc0cfb3..bbb16b85f 100644 --- a/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/ObservableLongImpl.scala +++ b/java/metrics/src/main/scala/org/typelevel/otel4s/java/metrics/ObservableLongImpl.scala @@ -20,7 +20,6 @@ package metrics import cats.effect.Sync import io.opentelemetry.api.metrics.ObservableLongMeasurement -import org.typelevel.otel4s.Attribute import org.typelevel.otel4s.metrics._ private[java] class ObservableLongImpl[F[_]]( diff --git a/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/SpanBackendImpl.scala b/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/SpanBackendImpl.scala index c02760f35..c4dc3b80e 100644 --- a/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/SpanBackendImpl.scala +++ b/java/trace/src/main/scala/org/typelevel/otel4s/java/trace/SpanBackendImpl.scala @@ -22,7 +22,6 @@ import cats.effect.Sync import cats.syntax.flatMap._ import io.opentelemetry.api.trace.{Span => JSpan} import io.opentelemetry.api.trace.{StatusCode => JStatusCode} -import org.typelevel.otel4s.Attribute import org.typelevel.otel4s.meta.InstrumentMeta import org.typelevel.otel4s.trace.Span import org.typelevel.otel4s.trace.SpanContext diff --git a/project/plugins.sbt b/project/plugins.sbt index 7f020a403..eb91a878e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22") -addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.4.22") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.22") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.5.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") diff --git a/sdk/common/src/main/scala/org/typelevel/otel4s/sdk/Resource.scala b/sdk/common/src/main/scala/org/typelevel/otel4s/sdk/Resource.scala index 2840f588f..0e7912f68 100644 --- a/sdk/common/src/main/scala/org/typelevel/otel4s/sdk/Resource.scala +++ b/sdk/common/src/main/scala/org/typelevel/otel4s/sdk/Resource.scala @@ -22,7 +22,6 @@ import cats.implicits.catsSyntaxOptionId import cats.implicits.catsSyntaxSemigroup import cats.implicits.showInterpolator import org.typelevel.otel4s.Attribute -import org.typelevel.otel4s.sdk.BuildInfo import org.typelevel.otel4s.sdk.Resource.ResourceInitiationError import org.typelevel.otel4s.semconv.resource.attributes.ResourceAttributes._