Merge pull request #572 from danicheg/merge-series/1.x-into-main

Merge `series/1.x` into main
typelevel · Dec 30, 2021 · 7c567e1 · 7c567e1
2 parents 1eb630a + a8c815a
commit 7c567e1
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,18 +27,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.7, 2.12.15, 3.0.2]
-        java: [adopt@1.8, adopt@1.11]
+        java: [temurin@8, temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 8
+
+      - name: Setup Java (temurin@11)
+        if: matrix.java == 'temurin@11'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -78,18 +87,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.7]
-        java: [adopt@1.8]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 8
+
+      - name: Setup Java (temurin@11)
+        if: matrix.java == 'temurin@11'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 11
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -161,18 +179,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.7, 2.12.15]
-        java: [adopt@1.8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 8
+
+      - name: Setup Java (temurin@11)
+        if: matrix.java == 'temurin@11'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -195,18 +222,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.12.15]
-        java: [adopt@1.8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 8
+
+      - name: Setup Java (temurin@11)
+        if: matrix.java == 'temurin@11'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 11
 
       - name: Cache sbt
         uses: actions/cache@v2

diff --git a/.scala-steward.conf b/.scala-steward.conf
@@ -0,0 +1,5 @@
+updates.pin = [
+  # Pin to Scala 3.0
+  { groupId = "org.scala-lang", artifactId = "scala-library", version = "3.0." },
+  { groupId = "org.scala-lang", artifactId = "scala3-library_sjs1", version = "3.0." },
+]
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,7 +1,7 @@
 # tune this file as appropriate to your style!  see:
 # https://scalameta.org/scalafmt/docs/configuration.html
 
-version = 2.7.5
+version = 3.3.0
 
 maxColumn = 100
 
@@ -20,9 +20,11 @@ align {
   tokens = ["%", "%%"]
 }
 
-docstrings = JavaDoc
+docstrings.style = Asterisk
 
 rewrite {
   rules = [SortImports, RedundantBraces]
   redundantBraces.maxLines = 1
 }
+
+runner.dialect = "scala213source3"
diff --git a/build.sbt b/build.sbt
@@ -13,7 +13,7 @@ ThisBuild / scalaVersion := Scala213
 ThisBuild / publishFullName := "Christopher Davenport"
 ThisBuild / publishGithubUser := "christopherdavenport"
 
-ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11")
+ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"), JavaSpec.temurin("11"))
 
 ThisBuild / versionIntroduced := Map(
   "2.12" -> "1.2.0",
@@ -66,7 +66,7 @@ ThisBuild / githubWorkflowPublish := Seq(
   WorkflowStep.Sbt(
     List("release")
   )
-) ++ micrositeWorkflowSteps(Some(MicrositesCond)).toSeq :+ WorkflowStep.Sbt(
+) ++ micrositeWorkflowSteps(Some(MicrositesCond)) :+ WorkflowStep.Sbt(
   List("docs/publishMicrosite"),
   cond = Some(MicrositesCond)
 )
@@ -75,7 +75,7 @@ val catsV = "2.7.0"
 val catsEffectV = "3.3.1"
 val slf4jV = "1.7.32"
 val munitCatsEffectV = "1.0.7"
-val logbackClassicV = "1.2.8"
+val logbackClassicV = "1.2.10"
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 

diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/extras/WriterTLogger.scala b/core/shared/src/main/scala/org/typelevel/log4cats/extras/WriterTLogger.scala
@@ -22,11 +22,10 @@ import cats.syntax.all._
 import org.typelevel.log4cats._
 
 /**
- * >>> WARNING READ BEFORE USAGE! <<<
- * This logger will NOT log anything if `F` fails!
+ * >>> WARNING READ BEFORE USAGE! <<< This logger will NOT log anything if `F` fails!
  *
- * Running the `WriterT` instance will yield a value of type `F[(G[LogMessage], A)]`.
- * As a result, the logged messages can be materialized if and only `F` succeeds.
+ * Running the `WriterT` instance will yield a value of type `F[(G[LogMessage], A)]`. As a result,
+ * the logged messages can be materialized if and only `F` succeeds.
  */
 object WriterTLogger {
   def apply[F[_]: Applicative, G[_]: Alternative](

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.7
+sbt.version=1.5.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
-addSbtPlugin("org.scalameta"      % "sbt-scalafmt"             % "2.4.5")
+addSbtPlugin("org.scalameta"      % "sbt-scalafmt"             % "2.4.6")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.7.1")
 addSbtPlugin("com.47deg"          % "sbt-microsites"           % "1.3.4")
 addSbtPlugin("com.typesafe.sbt"   % "sbt-ghpages"              % "0.6.3")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"                  % "0.4.3")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
 addSbtPlugin("org.scalameta"      % "sbt-mdoc"                 % "2.2.24")
-addSbtPlugin("com.codecommit"     % "sbt-spiewak-sonatype"     % "0.22.1")
+addSbtPlugin("com.codecommit"     % "sbt-spiewak-sonatype"     % "0.23.0")
diff --git a/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala b/slf4j/src/main/scala-2/org/typelevel/log4cats/slf4j/internal/GetLoggerMacros.scala
@@ -38,10 +38,10 @@ import scala.reflect.macros.blackbox
 /**
  * Macros that support the logging system.
  *
- *  See for handling call-by-name-parameters in macros
- *  https://issues.scala-lang.org/browse/SI-5778
+ * See for handling call-by-name-parameters in macros https://issues.scala-lang.org/browse/SI-5778
  *
- * @author Sarah Gerweck <sarah@atscale.com>
+ * @author
+ *   Sarah Gerweck <sarah@atscale.com>
  */
 private[slf4j] class GetLoggerMacros(val c: blackbox.Context) {
 

diff --git a/slf4j/src/main/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternal.scala b/slf4j/src/main/scala/org/typelevel/log4cats/slf4j/internal/Slf4jLoggerInternal.scala
@@ -48,8 +48,9 @@ private[slf4j] object Slf4jLoggerInternal {
       } MDC.put(k, v)
 
       try logging()
-      finally if (backup eq null) MDC.clear()
-      else MDC.setContextMap(backup)
+      finally
+        if (backup eq null) MDC.clear()
+        else MDC.setContextMap(backup)
     }
 
     isEnabled.ifM(

diff --git a/testing/shared/src/main/scala/org/typelevel/log4cats/testing/TestingLogger.scala b/testing/shared/src/main/scala/org/typelevel/log4cats/testing/TestingLogger.scala
@@ -16,7 +16,7 @@
 
 package org.typelevel.log4cats.testing
 
-import org.typelevel.log4cats.{SelfAwareLogger}
+import org.typelevel.log4cats.SelfAwareLogger
 import cats.effect.Sync
 import cats.implicits._
 import java.util.concurrent.atomic.AtomicReference