diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 491fc5ec..3f07bd13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,11 +87,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 plugin/target otel4s-trace/target/jvm-3 runtime/target/jvm-2.12 codegen/target/jvm-3 codegen/target/jvm-2.13 runtime/target/jvm-3 codegen/target/jvm-2.12 runtime/target/jvm-2.13 otel4s-trace/target/jvm-2.13 project/target + run: mkdir -p plugin/target runtime/target/jvm-2.12 codegen/target/jvm-3 codegen/target/jvm-2.12 runtime/target/jvm-3 otel4s-trace/target/jvm-3 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 plugin/target otel4s-trace/target/jvm-3 runtime/target/jvm-2.12 codegen/target/jvm-3 codegen/target/jvm-2.13 runtime/target/jvm-3 codegen/target/jvm-2.12 runtime/target/jvm-2.13 otel4s-trace/target/jvm-2.13 project/target + run: tar cf targets.tar plugin/target runtime/target/jvm-2.12 codegen/target/jvm-3 codegen/target/jvm-2.12 runtime/target/jvm-3 otel4s-trace/target/jvm-3 project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') @@ -224,7 +224,7 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: root_3 e2e_2.12 e2eotel4s_3 e2eotel4s_2.13 e2e_3 e2e_2.13 + modules-ignore: root_3 e2e_2.12 e2eotel4s_3 e2e_3 configs-ignore: test scala-tool scala-doc-tool test-internal validate-steward: diff --git a/build.sbt b/build.sbt index b514ab34..a92715ff 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import com.typesafe.tools.mima.core.ProblemFilters._ import Dependencies._ lazy val Scala3 = "3.3.8" -lazy val Scala213 = "2.13.18" +lazy val Scala213 = "3.9.0" lazy val Scala212 = "2.12.21" lazy val axesDefault =