Merge pull request #64 from liff/topic/scalatest-3.0.0

Upgrade to scalatest 3.0.0

Author: analytically

.travis.yml

@@ -3,23 +3,23 @@ dist: trusty
 language: scala
 scala:
    - 2.11.8
-   - 2.12.0-M4
+   - 2.12.0-M5
 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
-    #https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
-  - cat /etc/hosts # optionally check the content *before*
-  - sudo hostname "$(hostname | cut -c1-63)"
-  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
-  - cat /etc/hosts # optionally check the content *after*
 matrix:
   # scala 2.12 require java 8
   exclude:
-    - scala: 2.12.0-M4
+    - scala: 2.12.0-M5
       env: JDK=oraclejdk7
-    - scala: 2.12.0-M4
+    - scala: 2.12.0-M5
       env: JDK=openjdk7

build.sbt

@@ -10,7 +10,7 @@ Common.settings ++ defaultOsgiSettings ++ Seq(
   OsgiKeys.exportPackage := Seq("com.typesafe.scalalogging")
 )
 
-libraryDependencies ++= Dependencies.scalaLogging
+libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value)
 
 initialCommands := """|import com.typesafe.scalalogging._
                       |import org.slf4j.{ Logger => Underlying, _ }""".stripMargin

project/Dependencies.scala

@@ -4,25 +4,25 @@ object Version {
   val logback   = "1.1.7"
   val mockito   = "1.10.19"
   val scala     = "2.11.8"
-  val crossScala = List(scala, "2.12.0-M4")
-  val scalaTest = "2.2.6"
+  val crossScala = List(scala, "2.12.0-M5")
+  val scalaTest = "3.0.0"
   val slf4j     = "1.7.21"
 }
 
 object Library {
-  val logbackClassic = "ch.qos.logback" %  "logback-classic" % Version.logback
-  val mockitoAll     = "org.mockito"    %  "mockito-all"     % Version.mockito
-  val scalaReflect   = "org.scala-lang" % "scala-reflect"    % Version.scala
-  val scalaTest      = "org.scalatest"  %% "scalatest"       % Version.scalaTest
-  val slf4jApi       = "org.slf4j"      %  "slf4j-api"       % Version.slf4j
+  val logbackClassic                     = "ch.qos.logback" %  "logback-classic" % Version.logback
+  val mockitoAll                         = "org.mockito"    %  "mockito-all"     % Version.mockito
+  def scalaReflect(scalaVersion: String) = "org.scala-lang" % "scala-reflect"    % scalaVersion
+  val scalaTest                          = "org.scalatest"  %% "scalatest"       % Version.scalaTest
+  val slf4jApi                           = "org.slf4j"      %  "slf4j-api"       % Version.slf4j
 }
 
 object Dependencies {
 
   import Library._
 
-  val scalaLogging = List(
-    scalaReflect,
+  def scalaLogging(scalaVersion: String) = List(
+    scalaReflect(scalaVersion),
     slf4jApi,
     logbackClassic % "test",
     mockitoAll     % "test",

src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala

@@ -22,7 +22,7 @@ import org.mockito.Matchers._
 import org.mockito.Mockito._
 import org.slf4j.{ Logger => Underlying }
 import org.scalatest.{ Matchers, WordSpec }
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 
 class LoggerSpec extends WordSpec with Matchers with MockitoSugar {
 

src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala

@@ -22,7 +22,7 @@ import org.mockito.Mockito._
 import org.slf4j.{ Logger => Underlying }
 import org.slf4j.Marker
 import org.scalatest.{ Matchers, WordSpec }
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 
 object DummyMarker extends Marker {
   def add(childMarker: Marker): Unit = {}