Merge pull request #117 from xuwei-k/X-source-3-option

Author: eed3si9n

launcher-implementation/src/main/scala/xsbt/boot/Launch.scala

@@ -511,7 +511,7 @@ class Launch private[xsbt] (
       parentLoader: ClassLoader,
       scalaLibDir: File
   ): xsbti.ScalaProvider = new xsbti.ExtendedScalaProvider {
-    def launcher = Launch.this
+    def launcher: Launch = Launch.this
     def version = scalaVersion
 
     private object LoaderInit {

launcher-implementation/src/main/scala/xsbt/boot/ListMap.scala

@@ -22,7 +22,7 @@ sealed class ListMap[K, V] private (backing: List[(K, V)])
   def iterator = backing.reverse.iterator
   override def isEmpty: Boolean = backing.isEmpty
   override def toList = backing.reverse
-  override def toSeq = toList
+  override def toSeq: Seq[(K, V)] = toList
   protected def copy(newBacking: List[(K, V)]): ListMap[K, V] = new ListMap(newBacking)
   def default(defaultF: K => V): ListMap[K, V] =
     new ListMap[K, V](backing) {

launcher-implementation/src/main/scala/xsbt/boot/Update.scala

@@ -132,7 +132,7 @@ final class Update(config: UpdateConfiguration) {
   private lazy val ivy = {
     val ivy = new Ivy() {
       private val loggerEngine = new SbtMessageLoggerEngine;
-      override def getLoggerEngine = loggerEngine
+      override def getLoggerEngine: MessageLoggerEngine = loggerEngine
     }
     ivy.setSettings(settings)
     ivy.bind()

launcher-implementation/src/test/scala/EnumerationTest.scala

@@ -17,19 +17,19 @@ object EnumerationTest extends Properties("Enumeration") {
     List(("A" -> a), ("B" -> b), ("C" -> c))
   }
 
-  def checkElements(enum: Enumeration, mapped: (String, Enumeration#Value)*) = {
-    val elements = enum.elements
+  def checkElements(`enum`: Enumeration, mapped: (String, Enumeration#Value)*) = {
+    val elements = `enum`.elements
     ("elements: " + elements) |:
       (mapped.forall { case (s, v) => elements.contains(v) } && (elements.length == mapped.length))
   }
-  def checkToValue(enum: Enumeration, mapped: (String, Enumeration#Value)*) = {
+  def checkToValue(`enum`: Enumeration, mapped: (String, Enumeration#Value)*) = {
     def invalid(s: String) =
       ("valueOf(" + s + ")") |:
-        Prop.throws(classOf[Exception])(enum.toValue(s))
+        Prop.throws(classOf[Exception])(`enum`.toValue(s))
     def valid(s: String, expected: Enumeration#Value) =
       ("valueOf(" + s + ")") |:
         ("Expected " + expected) |:
-        (enum.toValue(s) == expected)
+        (`enum`.toValue(s) == expected)
     val map = Map(mapped: _*)
     Prop.forAll(
       (s: String) =>

launcher-implementation/src/test/scala/ListMapTest.scala

@@ -3,7 +3,7 @@ package xsbt.boot
 import org.scalacheck._
 
 object ListMapProperties extends Properties("ListMap") {
-  implicit val genListMap = Arbitrary(
+  implicit val genListMap: Arbitrary[ListMap[Int, Int]] = Arbitrary(
     for (list <- Arbitrary.arbitrary[List[(Int, Int)]]) yield ListMap(list: _*)
   )
 

project/Util.scala

@@ -42,7 +42,7 @@ object Util {
     },
     scalacOptions ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, 13)) => Seq("-deprecation", "-Xlint")
+        case Some((2, 13)) => Seq("-deprecation", "-Xlint", "-Xsource:3")
         case _             => Seq()
       }
     }