Merge 51a1501 into 4d7a656

build.sbt

@@ -1,5 +1,3 @@
-import Dependencies._
-
 name := "scaffeine"
 
 organization := "com.github.blemale"
@@ -16,11 +14,11 @@ scalaVersion := "2.11.12"
 
 libraryDependencies ++=
   Seq(
-    Caffeine,
-    Java8Compat,
-    Jsr305 % "provided",
-    Scalactic % "test",
-    Scalatest % "test"
+      "com.github.ben-manes.caffeine" % "caffeine" % CaffeineVersion.value,
+      "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.0",
+      "com.google.code.findbugs" % "jsr305" % "3.0.2" % "provided",
+      "org.scalactic" %% "scalactic" % "3.1.0-SNAP13" % "test",
+      "org.scalatest" %% "scalatest" % "3.1.0-SNAP13" % "test"
   )
 
 scalacOptions ++= Seq("-target:jvm-1.8")

project/CaffeineVersion.scala

@@ -0,0 +1,5 @@
+object CaffeineVersion {
+
+  val value: String = "2.8.0"
+
+}

scaladoc.sbt

@@ -1,5 +1,3 @@
-import Dependencies.CaffeineVersion
-
 import scala.util.control.NonFatal
 import scala.util.matching.Regex.Match
 
@@ -21,7 +19,7 @@ apiMappings ++= {
 
   Map(
     bootClasspath.find(_.getPath.endsWith("rt.jar")).get -> url("http://docs.oracle.com/javase/8/docs/api/"),
-    findManagedDependency("com.github.ben-manes.caffeine", "caffeine") -> url(s"http://static.javadoc.io/com.github.ben-manes.caffeine/caffeine/$CaffeineVersion/")
+    findManagedDependency("com.github.ben-manes.caffeine", "caffeine") -> url(s"http://static.javadoc.io/com.github.ben-manes.caffeine/caffeine/${CaffeineVersion.value}/")
   )
 }
 
@@ -30,7 +28,7 @@ lazy val fixJavaLinksTask = taskKey[Unit](
 )
 
 val jdkApiLink = """\"(http://docs\.oracle\.com/javase/8/docs/api/index\.html)#([^"]*)\"""".r
-val caffeineApiLink = ("""\"(http://static\.javadoc\.io/com\.github\.ben-manes\.caffeine/caffeine/""" + CaffeineVersion.replace(".", "\\.") + """/)index\.html#([^"]*)\"""").r
+val caffeineApiLink = ("""\"(http://static\.javadoc\.io/com\.github\.ben-manes\.caffeine/caffeine/""" + CaffeineVersion.value.replace(".", "\\.") + """/)index\.html#([^"]*)\"""").r
 
 def hasJavadocLink(f: File): Boolean = {
   val content = IO.read(f)