Merge pull request #366 from sbt/Xsource-3

add `-Xsource:3` option
sbt · Dec 28, 2023 · d7a2698 · d7a2698
2 parents 3c1569c + 9af0d6f
commit d7a2698
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/io/src/main/scala/sbt/internal/io/Milli.scala b/io/src/main/scala/sbt/internal/io/Milli.scala
@@ -36,7 +36,7 @@ import scala.util.control.NonFatal
 private abstract class Stat[Time_T](size: Int) extends NativeMapped {
   val buffer = ByteBuffer.allocate(size).order(ByteOrder.nativeOrder())
 
-  def fromNative(nativeValue: Object, context: FromNativeContext) =
+  def fromNative(nativeValue: Object, context: FromNativeContext): Nothing =
     throw new UnsupportedOperationException("Not supported.")
 
   def toNative(): Object = buffer
@@ -149,7 +149,7 @@ private abstract class PosixMilliInt[Interface <: Posix[Int]: ClassTag]
 //
 private abstract class TimeSpec2[Time_T] extends NativeMapped {
   val buffer: Array[Time_T]
-  def fromNative(nativeValue: Object, context: FromNativeContext) =
+  def fromNative(nativeValue: Object, context: FromNativeContext): Nothing =
     throw new UnsupportedOperationException("Not supported.")
   def toNative(): Object = buffer
   def nativeType(): Class[Array[Time_T]] = classOf[Array[Time_T]]

diff --git a/io/src/main/scala/sbt/internal/nio/TimeSource.scala b/io/src/main/scala/sbt/internal/nio/TimeSource.scala
@@ -66,7 +66,7 @@ private[nio] trait Deadline extends Comparable[Deadline] {
 private[nio] object Deadline {
   def now(implicit timeSource: TimeSource): Deadline = timeSource.now
   private[nio] object Inf extends Deadline {
-    override val value = Duration.Inf
+    override val value: Duration = Duration.Inf
     override def isOverdue: Boolean = false
     override def compareTo(o: Deadline): Int = this.value compareTo o.value
     override def +(duration: FiniteDuration): Deadline = this

diff --git a/project/HouseRulesPluglin.scala b/project/HouseRulesPluglin.scala
@@ -24,6 +24,8 @@ object HouseRulesPlugin extends AutoPlugin {
       })
       .value
       .toList,
+    scalacOptions ++= "-Xsource:3".ifScala213OrMinus.value.toList,
+    scalacOptions ++= "-Wconf:msg=package object inheritance is deprecated:warning".ifScala213OrMinus.value.toList,
     scalacOptions ++= "-Yno-adapted-args".ifScala212OrMinus.value.toList,
     scalacOptions ++= "-Ywarn-dead-code".ifScala213OrMinus.value.toList,
     scalacOptions ++= "-Ywarn-numeric-widen".ifScala213OrMinus.value.toList,