Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ThisBuild / organizationHomepage := Some(url("http://scala-sbt.org/"))
ThisBuild / homepage := Some(url("https://github.com/sbt/sbinary"))
ThisBuild / version := "0.5.2-SNAPSHOT"
ThisBuild / scalaVersion := scala212
ThisBuild / crossScalaVersions := Seq(scala210, scala211, scala212, scala213, scala3)
ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3)
ThisBuild / developers := List(
Developer(
"drmaciver",
Expand Down
13 changes: 2 additions & 11 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,16 @@ import sbt._
import Keys._

object Dependencies {
val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.17"
val scala213 = "2.13.10"
val scala3 = "3.2.1"

val scalacheck = Def.setting {
scalaBinaryVersion.value match {
case "2.10" | "2.11" =>
"org.scalacheck" %% "scalacheck" % "1.14.3"
case _ =>
"org.scalacheck" %% "scalacheck" % "1.15.4"
}
"org.scalacheck" %% "scalacheck" % "1.15.4"
}
def scalaXmlDep(scalaV: String): List[ModuleID] =
CrossVersion.partialVersion(scalaV) match {
case Some((2, minor)) if minor <= 10 =>
Nil
case Some((2, 11 | 12)) =>
case Some((2, 12)) =>
List("org.scala-lang.modules" %% "scala-xml" % "1.0.6")
case Some((2, 13)) =>
List("org.scala-lang.modules" %% "scala-xml" % "1.2.0")
Expand Down
3 changes: 0 additions & 3 deletions project/HouseRulesPlugins.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ object HouseRulesPlugin extends AutoPlugin {
})
.value
.toList,
scalacOptions ++= "-Yinline-warnings".ifScala211OrMinus.value.toList,
scalacOptions ++= "-Yno-adapted-args".ifScala212OrMinus.value.toList,
scalacOptions += "-Ywarn-dead-code",
scalacOptions += "-Ywarn-numeric-widen",
Expand All @@ -43,8 +42,6 @@ object HouseRulesPlugin extends AutoPlugin {
Def setting (scalaPartV.value collect { case (2, y) if p(y) => __x })
def ifScalaLte(v: Long) = ifScala(_ <= v)
def ifScalaGte(v: Long) = ifScala(_ >= v)
def ifScala211OrMinus = ifScalaLte(11)
def ifScala211OrPlus = ifScalaGte(11)
def ifScala212OrMinus = ifScalaLte(12)
def ifScala213OrMinus = ifScalaLte(13)
}
Expand Down
Loading