Merge remote-tracking branch 'remotes/upstream/master'

Author: paweliwanow

.travis.yml

@@ -2,39 +2,14 @@ sudo: required
 dist: trusty
 language: scala
 scala:
-   - 2.11.8
-   - 2.12.0-M5
-   - 2.12.0-RC1
-   - 2.12.0-RC2
-   - 2.12.0
+   - 2.11.11
+   - 2.12.4
+   - 2.13.0-M2
 env:
 - JDK=oraclejdk8
 - JDK=openjdk8
-- JDK=oraclejdk7
-- JDK=openjdk7
-addons:
-  # https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
-  hosts:
-    - scala-logging
-  hostname: scala-logging
 before_script:
   - jdk_switcher use $JDK
-matrix:
-  # scala 2.12 requires java 8
-  exclude:
-    - scala: 2.12.0-M5
-      env: JDK=oraclejdk7
-    - scala: 2.12.0-M5
-      env: JDK=openjdk7
-    - scala: 2.12.0-RC1
-      env: JDK=oraclejdk7
-    - scala: 2.12.0-RC1
-      env: JDK=openjdk7
-    - scala: 2.12.0-RC2
-      env: JDK=oraclejdk7
-    - scala: 2.12.0-RC2
-      env: JDK=openjdk7
-    - scala: 2.12.0
-      env: JDK=oraclejdk7
-    - scala: 2.12.0
-      env: JDK=openjdk7
+script:
+- sbt "++ ${TRAVIS_SCALA_VERSION}!" test
+- git diff --exit-code # check scalariform

README.md

@@ -23,7 +23,7 @@ if (logger.isDebugEnabled) logger.debug(s"Some $expensive message!")
 A compatible logging backend is [Logback](http://logback.qos.ch), add it to your sbt build definition:
 
 ```scala
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.1.7"
+libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3"
 ```
 
 If you are looking for a version compatible with Scala 2.10, check out Scala Logging 2.x.
@@ -34,12 +34,12 @@ Scala Logging is published to Sonatype OSS and Maven Central:
 
 - Group id / organization: *com.typesafe.scala-logging*
 - Artifact id / name: *scala-logging*
-- Latest version is 3.5.0
+- Latest version is 3.7.2
 
 Usage with SBT, adding a dependency to the latest version of Scala Logging to your sbt build definition file:
 
 ```scala
-libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0"
+libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
 ```
 
 ## Using Scala Logging ##
@@ -124,6 +124,17 @@ def serviceMethod(implicit correlationId: CorrelationId): Future[Result] = {
 
 ### What's new?
 
+#### 3.7.2
+ - Make logger to consume args of type `Any` with slf4 interpolator.
+
+#### 3.7.1
+ - Remove @volatile from lazy logger, failing with strict compiler settings
+
+##### 3.7.0
+ - Deconstruct Scala's string interpolation into SLF4J string interpolation.
+ 
+##### 3.6.0 - flawed release
+
 ##### 3.5.0
  - More Logger factory methods, bugfixes and upgrades, published for Scala 2.12.0-M5, 2.12.0-RC1, 2.12.0-RC2 and 2.12.0.
 
@@ -137,6 +148,28 @@ def serviceMethod(implicit correlationId: CorrelationId): Future[Result] = {
  - SLF4J loggers and our Logger now survive serialization. By survive serialization, we mean that the
    deserialized logger instances are fully functional.
 
+## String Interpolation
+It is idiomatic to use Scala's string interpolation `logger.error(s"log $value")` instead of SLF4J string interpolation `logger.error("log {}", value)`.
+However there are some tools (such as [Sentry](https://sentry.io)) that use the log message format as grouping key. Therefore they do not work well with
+Scala's string interpolation.
+
+Scala Logging replaces simple string interpolations with their SLF4J counterparts like this:
+
+```scala
+logger.error(s"my log message: $arg1 $arg2 $arg3")
+```
+
+```scala
+logger.error("my log message: {} {} {}", arg1, arg2, arg3)
+```
+
+This has no effect on behavior and performace should be comparable (depends on the underlying logging library).
+
+### Limitations
+ - Works only when string interpolation is directly used inside the logging statement. That is when the log message is static (available at compile time).
+ - Works only for the `logger.<level>(message)` and `logger.<level>(marker, message)` logging methods. It does not work if you want to log an exception and
+ use string interpolation too (this is a limitation of the SLF4J API).
+
 ## Line numbers in log message?
 
 Using the [sourcecode](https://github.com/lihaoyi/sourcecode#logging) library, it's possible to add line number

project/Dependencies.scala

@@ -1,12 +1,12 @@
 import sbt._
 
 object Version {
-  val logback   = "1.1.7"
+  val logback   = "1.2.3"
   val mockito   = "1.10.19"
-  val scala     = "2.11.8"
-  val crossScala = List(scala, "2.12.0-M5", "2.12.0-RC1", "2.12.0-RC2", "2.12.0")
-  val scalaTest = "3.0.0"
-  val slf4j     = "1.7.21"
+  val scala     = "2.11.12"
+  val crossScala = List(scala, "2.12.4", "2.13.0-M2")
+  val scalaTest = "3.0.4"
+  val slf4j     = "1.7.25"
 }
 
 object Library {

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=1.1.0

project/plugins.sbt

@@ -1,11 +1,11 @@
 resolvers += Resolver.typesafeRepo("releases")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
 
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.2")
 
-addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.0")
+addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.2")

scalariform.sbt

@@ -1,8 +1,6 @@
 import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 import scalariform.formatter.preferences.{AlignSingleLineCaseStatements, DoubleIndentClassDeclaration}
 
-scalariformSettings
-
 ScalariformKeys.preferences := ScalariformKeys.preferences.value
   .setPreference(AlignSingleLineCaseStatements, true)
   .setPreference(AlignSingleLineCaseStatements.MaxArrowIndent, 100)