From 45b8eda489b991d4ec72004587a95948a88cbb28 Mon Sep 17 00:00:00 2001
From: Krzysztof Bochenek <kpbochenek@gmail.com>
Date: Tue, 25 Aug 2020 10:26:01 +0200
Subject: [PATCH 1/8] Travis fix for jdk11

---
 .gitignore  |  5 +++++
 .travis.yml | 10 ++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 10be92c..59b5bce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,11 @@ target/
 # IntelliJ
 .idea/
 
+# VSCode
+.bloop/
+.metals/
+project/metals.sbt
+
 # ENSIME
 .ensime
 .ensime_lucene/
diff --git a/.travis.yml b/.travis.yml
index 31f5b93..023084c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,10 @@ scala:
    - 2.12.11
    - 2.11.12
    - 2.13.1
-env:
-- JDK=oraclejdk8
-- JDK=openjdk8
-- JDK=openjdk11
-before_script:
-  - jdk_switcher use $JDK
+jdk:
+  - oraclejdk8
+  - openjdk8
+  - openjdk11
 script:
 - sbt "++ ${TRAVIS_SCALA_VERSION}!" test
 - git diff --exit-code # check scalariform

From 1cbb621858fad37df8c5d9f77e34e36b894d056d Mon Sep 17 00:00:00 2001
From: Krzysztof Bochenek <kpbochenek@gmail.com>
Date: Tue, 25 Aug 2020 10:32:32 +0200
Subject: [PATCH 2/8] Add caching scala deps

---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 023084c..739e43d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,24 @@
 sudo: required
 dist: trusty
+
 language: scala
 scala:
    - 2.12.11
    - 2.11.12
    - 2.13.1
+
 jdk:
   - oraclejdk8
   - openjdk8
   - openjdk11
+
 script:
 - sbt "++ ${TRAVIS_SCALA_VERSION}!" test
 - git diff --exit-code # check scalariform
+
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/.ivy2/cache
+  - $HOME/.sbt/boot/
+

From 0139d909cfd8d97b0a3389e8b725a0fa8cf2a2d6 Mon Sep 17 00:00:00 2001
From: Krzysztof Bochenek <kpbochenek@gmail.com>
Date: Tue, 25 Aug 2020 10:40:40 +0200
Subject: [PATCH 3/8] Fix various warnings in code

---
 src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala     | 2 +-
 .../com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala  | 2 +-
 .../com/typesafe/scalalogging/LoggerWithMarkerSpec.scala      | 2 +-
 .../com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala  | 4 ----
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala
index f97d6c6..fe48c62 100644
--- a/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala
+++ b/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala
@@ -595,7 +595,7 @@ class LoggerSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
       val msg = "msg"
       val cause = new RuntimeException("cause")
       val arg1 = "arg1"
-      val arg2 = new Integer(1)
+      val arg2 = Integer.valueOf(1)
       val arg3 = "arg3"
       val arg4 = 4
       val arg4ref = arg4.asInstanceOf[AnyRef]
diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala
index fe5fca8..ca5e79f 100644
--- a/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala
+++ b/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala
@@ -382,7 +382,7 @@ class LoggerTakingImplicitSpec extends WordSpec with Matchers with MockitoSugar
       val msg = "msg"
       val cause = new RuntimeException("cause")
       val arg1 = "arg1"
-      val arg2 = new Integer(1)
+      val arg2 = Integer.valueOf(1)
       val arg3 = "arg3"
       val logMsg = "corrId - msg"
       val underlying = mock[org.slf4j.Logger]
diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala
index 21c20c2..401cf28 100644
--- a/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala
+++ b/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala
@@ -387,7 +387,7 @@ class LoggerWithMarkerSpec extends WordSpec with Matchers with MockitoSugar with
       val msg = "msg"
       val cause = new RuntimeException("cause")
       val arg1 = "arg1"
-      val arg2 = new Integer(1)
+      val arg2 = Integer.valueOf(1)
       val arg3 = "arg3"
       val underlying = mock[org.slf4j.Logger]
       when(p(underlying)(marker)).thenReturn(isEnabled)
diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala
index e6f6d0f..91dfbc7 100644
--- a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala
+++ b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala
@@ -2,10 +2,8 @@ package com.typesafe.scalalogging
 
 import org.scalatest.{ Matchers, WordSpec }
 
-import java.lang.ClassCastException
 import org.slf4j.{ Logger => Underlying }
 import org.scalatestplus.mockito.MockitoSugar
-import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
 
 object tag {
@@ -24,8 +22,6 @@ class LoggerWithTaggedAargsSpec extends WordSpec with MockitoSugar with Matchers
 
   trait Tag
 
-  import tag._
-
   "Calling error with tagged args" should {
 
     "not throw ClassCastException when varargs are passed" in {

From 0bc9fde51711ca600f1648b1302e7e4731337289 Mon Sep 17 00:00:00 2001
From: Krzysztof Bochenek <kpbochenek@gmail.com>
Date: Tue, 25 Aug 2020 10:43:43 +0200
Subject: [PATCH 4/8] Update deprecated travis image and don't require sudo

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 739e43d..f07d95f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
-sudo: required
-dist: trusty
+dist: bionic
 
 language: scala
 scala:
@@ -8,7 +7,7 @@ scala:
    - 2.13.1
 
 jdk:
-  - oraclejdk8
+  - oraclejdk11
   - openjdk8
   - openjdk11
 

From 0a65c866af58a2916515ee0540f6fb8800a6cc81 Mon Sep 17 00:00:00 2001
From: Krzysztof Bochenek <kpbochenek@gmail.com>
Date: Tue, 25 Aug 2020 11:04:33 +0200
Subject: [PATCH 5/8] Update scala and make 2.13 default

---
 .travis.yml                | 4 ++--
 project/Dependencies.scala | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f07d95f..e10815e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ dist: bionic
 
 language: scala
 scala:
-   - 2.12.11
+   - 2.12.12
    - 2.11.12
-   - 2.13.1
+   - 2.13.3
 
 jdk:
   - oraclejdk11
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index b9f880e..fee81db 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -3,8 +3,8 @@ import sbt._
 object Version {
   val logback   = "1.2.3"
   val mockito   = "1.5.17"
-  val scala     = "2.12.11"
-  val crossScala = List(scala, "2.11.12", "2.13.1")
+  val scala     = "2.13.3"
+  val crossScala = List(scala, "2.11.12", "2.12.12")
   val scalaTest = "3.0.8"
   val slf4j     = "1.7.30"
 }

From bf012d759669a81cc63b0901d0d543dc90ddd1ff Mon Sep 17 00:00:00 2001
From: Krzysztof Bochenek <kpbochenek@gmail.com>
Date: Tue, 25 Aug 2020 11:12:50 +0200
Subject: [PATCH 6/8] Bump mockito-scala

---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index fee81db..560540e 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -2,7 +2,7 @@ import sbt._
 
 object Version {
   val logback   = "1.2.3"
-  val mockito   = "1.5.17"
+  val mockito   = "1.5.18"
   val scala     = "2.13.3"
   val crossScala = List(scala, "2.11.12", "2.12.12")
   val scalaTest = "3.0.8"

From 88e49fd24b18e7e7f6b4364afab76e1830a2c415 Mon Sep 17 00:00:00 2001
From: Krzysztof Bochenek <kpbochenek@gmail.com>
Date: Tue, 25 Aug 2020 11:30:58 +0200
Subject: [PATCH 7/8] Scalatest 3.2.2

---
 project/Dependencies.scala                             |  2 +-
 .../scala/com/typesafe/scalalogging/LoggerSpec.scala   |  8 ++++----
 .../scalalogging/LoggerTakingImplicitSpec.scala        | 10 +++++-----
 .../typesafe/scalalogging/LoggerWithMarkerSpec.scala   |  8 ++++----
 .../scalalogging/LoggerWithTaggedArgsSpec.scala        |  9 ++++-----
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 560540e..cbbbf88 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -5,7 +5,7 @@ object Version {
   val mockito   = "1.5.18"
   val scala     = "2.13.3"
   val crossScala = List(scala, "2.11.12", "2.12.12")
-  val scalaTest = "3.0.8"
+  val scalaTest = "3.2.1"
   val slf4j     = "1.7.30"
 }
 
diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala
index fe48c62..0aef93d 100644
--- a/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala
+++ b/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala
@@ -21,8 +21,8 @@ import java.io._
 import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
 import org.slf4j.{ Logger => Underlying }
-import org.scalatest.{ Matchers, WordSpec }
-import org.scalatestplus.mockito.MockitoSugar
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
 trait Varargs {
   // TODO: we used to wrap in List(...): _*, which I assume was to force the varags method to be chosen.
@@ -30,7 +30,7 @@ trait Varargs {
   def forceVarargs[T](xs: T*): scala.Seq[T] = scala.Seq(xs: _*)
 }
 
-class LoggerSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
+class LoggerSpec extends AnyWordSpec with Matchers with Varargs {
 
   // Error
 
@@ -603,7 +603,7 @@ class LoggerSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
       val arg5ref = arg5.asInstanceOf[AnyRef]
       val arg6 = 6L
       val arg6ref = arg6.asInstanceOf[AnyRef]
-      val underlying = mock[org.slf4j.Logger]
+      val underlying = mock(classOf[org.slf4j.Logger])
       when(p(underlying)).thenReturn(isEnabled)
       val logger = Logger(underlying)
     }
diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala
index ca5e79f..ae78bbf 100644
--- a/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala
+++ b/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala
@@ -2,11 +2,11 @@ package com.typesafe.scalalogging
 
 import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
-import org.scalatestplus.mockito.MockitoSugar
-import org.scalatest.{ Matchers, WordSpec }
 import org.slf4j.{ Logger => Underlying }
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class LoggerTakingImplicitSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
+class LoggerTakingImplicitSpec extends AnyWordSpec with Matchers with Varargs {
 
   case class CorrelationId(value: String)
 
@@ -378,14 +378,14 @@ class LoggerTakingImplicitSpec extends WordSpec with Matchers with MockitoSugar
   def fixture(p: Underlying => Boolean, isEnabled: Boolean) =
     new {
       implicit val correlationId = CorrelationId("corrId")
-      implicit val canLogCorrelationId = mock[CanLog[CorrelationId]]
+      implicit val canLogCorrelationId = mock(classOf[CanLog[CorrelationId]])
       val msg = "msg"
       val cause = new RuntimeException("cause")
       val arg1 = "arg1"
       val arg2 = Integer.valueOf(1)
       val arg3 = "arg3"
       val logMsg = "corrId - msg"
-      val underlying = mock[org.slf4j.Logger]
+      val underlying = mock(classOf[org.slf4j.Logger])
       when(p(underlying)).thenReturn(isEnabled)
       when(canLogCorrelationId.logMessage(anyString(), any[CorrelationId])).thenReturn(logMsg)
       val logger = Logger.takingImplicit[CorrelationId](underlying)
diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala
index 401cf28..51aad5c 100644
--- a/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala
+++ b/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala
@@ -21,8 +21,8 @@ import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
 import org.slf4j.{ Logger => Underlying }
 import org.slf4j.Marker
-import org.scalatest.{ Matchers, WordSpec }
-import org.scalatestplus.mockito.MockitoSugar
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
 object DummyMarker extends Marker {
   def add(childMarker: Marker): Unit = {}
@@ -39,7 +39,7 @@ object DummyMarker extends Marker {
   def remove(child: Marker): Boolean = false
 }
 
-class LoggerWithMarkerSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
+class LoggerWithMarkerSpec extends AnyWordSpec with Matchers with Varargs {
 
   // Error
 
@@ -389,7 +389,7 @@ class LoggerWithMarkerSpec extends WordSpec with Matchers with MockitoSugar with
       val arg1 = "arg1"
       val arg2 = Integer.valueOf(1)
       val arg3 = "arg3"
-      val underlying = mock[org.slf4j.Logger]
+      val underlying = mock(classOf[org.slf4j.Logger])
       when(p(underlying)(marker)).thenReturn(isEnabled)
       val logger = Logger(underlying)
     }
diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala
index 91dfbc7..99c57ca 100644
--- a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala
+++ b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala
@@ -1,10 +1,9 @@
 package com.typesafe.scalalogging
 
-import org.scalatest.{ Matchers, WordSpec }
-
 import org.slf4j.{ Logger => Underlying }
-import org.scalatestplus.mockito.MockitoSugar
 import org.mockito.Mockito._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
 object tag {
 
@@ -18,7 +17,7 @@ object tag {
   }
 }
 
-class LoggerWithTaggedAargsSpec extends WordSpec with MockitoSugar with Matchers with Varargs {
+class LoggerWithTaggedAargsSpec extends AnyWordSpec with Matchers with Varargs {
 
   trait Tag
 
@@ -102,7 +101,7 @@ class LoggerWithTaggedAargsSpec extends WordSpec with MockitoSugar with Matchers
     new {
       val arg1 = tag[Tag][String]("arg1")
       val arg2 = tag[Tag][Integer](Integer.valueOf(1))
-      val underlying = mock[org.slf4j.Logger]
+      val underlying = mock(classOf[org.slf4j.Logger])
       when(p(underlying)).thenReturn(isEnabled)
       val logger = Logger(underlying)
     }

From 22597f4b1db0e6627328c4331e6bdc077239623a Mon Sep 17 00:00:00 2001
From: Krzysztof Bochenek <kpbochenek@gmail.com>
Date: Tue, 25 Aug 2020 18:57:46 +0200
Subject: [PATCH 8/8] Revert scala to 2.13.1

---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index cbbbf88..2e1e7e9 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -3,7 +3,7 @@ import sbt._
 object Version {
   val logback   = "1.2.3"
   val mockito   = "1.5.18"
-  val scala     = "2.13.3"
+  val scala     = "2.13.1"
   val crossScala = List(scala, "2.11.12", "2.12.12")
   val scalaTest = "3.2.1"
   val slf4j     = "1.7.30"