Skip to content

Commit

Permalink
build: enable 3.0-migration compiler option for all modules for now
Browse files Browse the repository at this point in the history
  • Loading branch information
jrudolph committed Mar 21, 2022
1 parent 67adeab commit b6c2dbc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
9 changes: 0 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,6 @@ lazy val httpCore = project("akka-http-core")
if (System.getProperty("akka.http.test-against-akka-main", "false") == "true") AkkaDependency.masterSnapshot
else AkkaDependency.default
)
.settings(
scalacOptions ++= {
if (scalaVersion.value startsWith "3")
Seq("-source", "3.0-migration")
else
Nil
},
)
.settings(Dependencies.httpCore)
.settings(VersionGenerator.versionSettings)
.settings(scalaMacroSupport)
Expand All @@ -184,7 +176,6 @@ lazy val http = project("akka-http")
.settings(scalaMacroSupport)
.enablePlugins(BootstrapGenjavadoc, BoilerplatePlugin)
.enablePlugins(ReproducibleBuildsPlugin)
.enablePlugins(NoScala3) // FIXME

def gustavDir(kind: String) = Def.task {
val ver =
Expand Down
8 changes: 7 additions & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ object Common extends AutoPlugin {
Test / compile / scalacOptions += "-Wconf:msg=match may not be exhaustive:s",

mimaReportSignatureProblems := true,
Global / parallelExecution := sys.props.getOrElse("akka.http.parallelExecution", "true") != "false"
Global / parallelExecution := sys.props.getOrElse("akka.http.parallelExecution", "true") != "false",
scalacOptions ++= {
if (scalaVersion.value startsWith "3")
Seq("-source", "3.0-migration") // FIXME, eventually
else
Nil
},
)

val specificationVersion: String = sys.props("java.specification.version")
Expand Down

0 comments on commit b6c2dbc

Please sign in to comment.