Skip to content
This repository has been archived by the owner on Apr 22, 2020. It is now read-only.

Don't set -Yno-adapted-args in Scala 2.13 #1190

Merged
merged 1 commit into from
Jul 22, 2019
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
24 changes: 16 additions & 8 deletions core/src/main/scala/sbtorgpolicies/model.scala
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,24 @@ object model {
"-Xplugin-require:macroparadise")

/** Scalac strict compilation options.*/
lazy val scalacStrictOptions = Seq(
"-Yno-adapted-args",
"-Ywarn-dead-code",
"-Ywarn-numeric-widen",
"-Ywarn-value-discard",
"-Xfuture"
)
def scalacStrictOptions(scalaVersion: String) = {
val noAdaptedArgs = if (scalaVersion >= "2.13.0") {
Seq()
} else {
Seq("-Yno-adapted-args")
}

Seq(
"-Ywarn-dead-code",
"-Ywarn-numeric-widen",
"-Ywarn-value-discard",
"-Xfuture"
) ++ noAdaptedArgs
}

/** Combines all scalac options.*/
lazy val scalacAllOptions: Seq[String] = scalacCommonOptions ++ scalacLanguageOptions ++ scalacStrictOptions
def scalacAllOptions(scalaVersion: String): Seq[String] =
scalacCommonOptions ++ scalacLanguageOptions ++ scalacStrictOptions(scalaVersion)

/** Github settings and related settings usually found in a Github README.*/
case class GitHubSettings(
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/sbtorgpolicies/settings/AllSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ trait AllSettings
scalaOrganization := "org.scala-lang",
scalaVersion := scalac.`2.12`,
crossScalaVersions := scalac.crossScalaVersions,
scalacOptions ++= scalacAllOptions
scalacOptions ++= scalacAllOptions(scalaVersion.value)
)

implicit val settingAppender: sbt.Append.Value[Seq[(String, java.net.URL)], License] =
Expand Down