Merge branch 'master' into series/2.x

zio · Jul 19, 2022 · 84e869d · 84e869d
2 parents 0ed1770 + e492dc5
commit 84e869d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -7,7 +7,7 @@ jobs:
   auto-approve:
     runs-on: ubuntu-20.04
     steps:
-      - uses: hmarr/auto-approve-action@v2.1.0
+      - uses: hmarr/auto-approve-action@v2.2.1
         if: github.actor == 'scala-steward' || github.actor == 'renovate[bot]'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,11 +22,11 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 0
       - name: Setup Java
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 17
@@ -41,9 +41,9 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.2
       - name: Setup Java
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 17
@@ -60,14 +60,14 @@ jobs:
       fail-fast: false
       matrix:
         java: ['8', '11', '17']
-        scala: ['2.12.15', '2.13.8', '3.1.0']
+        scala: ['2.12.16', '2.13.8', '3.1.0']
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 0
       - name: Setup Java
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: ${{ matrix.java }}
@@ -85,9 +85,9 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.2
       - name: Setup Java
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 8
@@ -111,11 +111,11 @@ jobs:
     if: github.event_name != 'pull_request'
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3.0.2
         with:
           fetch-depth: 0
       - name: Setup Java
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 8

diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -15,9 +15,9 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Java
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.4.1
         with:
           distribution: temurin
           java-version: 17

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.4.2"
+version = "3.5.8"
 maxColumn = 120
 align.preset = most
 continuationIndent.defnSite = 2

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,7 +5,7 @@ object Dependencies {
     val opentracing           = "0.33.0"
     val opentelemetry         = "1.15.0"
     val opencensus            = "0.31.1"
-    val scalaCollectionCompat = "2.7.0"
+    val scalaCollectionCompat = "2.8.0"
     val zio                   = "2.0.0"
   }
 
@@ -30,15 +30,15 @@ object Dependencies {
   lazy val opentracing = zio ++ Seq(
     "io.opentracing"          % "opentracing-api"         % Versions.opentracing,
     "io.opentracing"          % "opentracing-noop"        % Versions.opentracing,
-    "io.opentracing"          % "opentracing-mock"        % Versions.opentracing % Test,
-    "org.scala-lang.modules" %% "scala-collection-compat" % Versions.scalaCollectionCompat
+    "org.scala-lang.modules" %% "scala-collection-compat" % Versions.scalaCollectionCompat,
+    "io.opentracing"          % "opentracing-mock"        % Versions.opentracing % Test
   )
 
   lazy val opentelemetry = zio ++ Seq(
     "io.opentelemetry"        % "opentelemetry-api"         % Versions.opentelemetry,
     "io.opentelemetry"        % "opentelemetry-context"     % Versions.opentelemetry,
-    "io.opentelemetry"        % "opentelemetry-sdk-testing" % Versions.opentelemetry % Test,
-    "org.scala-lang.modules" %% "scala-collection-compat"   % Versions.scalaCollectionCompat
+    "org.scala-lang.modules" %% "scala-collection-compat"   % Versions.scalaCollectionCompat,
+    "io.opentelemetry"        % "opentelemetry-sdk-testing" % Versions.opentelemetry % Test
   )
 
   lazy val opencensus = zio ++ Seq(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@ addSbtPlugin("com.github.sbt"                    % "sbt-ci-release"   % "1.5.10"
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
 addSbtPlugin("com.github.sbt"                    % "sbt-unidoc"       % "0.5.0")
 addSbtPlugin("ch.epfl.scala"                     % "sbt-bloop"        % "1.5.2")
-addSbtPlugin("io.github.davidgregory084"         % "sbt-tpolecat"     % "0.3.3")
+addSbtPlugin("io.github.davidgregory084"         % "sbt-tpolecat"     % "0.4.0")
 addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"     % "2.4.6")
 addSbtPlugin("org.scalameta"                     % "sbt-mdoc"         % "2.3.2")
 addSbtPlugin("org.scoverage"                     % "sbt-scoverage"    % "2.0.0")