Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: try removing release flag #3119

Merged
merged 1 commit into from
Aug 21, 2024
Merged

fix: try removing release flag #3119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 2 additions & 17 deletions modules/build/src/main/scala/scala/build/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,10 +862,6 @@ object Build {
val semanticDbSourceRoot =
options.scalaOptions.semanticDbOptions.semanticDbSourceRoot.getOrElse(inputs.workspace)

val releaseFlagVersion =
if (options.useBuildServer.getOrElse(true)) None
else releaseFlag(options, compilerJvmVersionOpt, logger).map(_.toString)

val scalaCompilerParamsOpt = artifacts.scalaOpt match {
case Some(scalaArtifacts) =>
val params = value(options.scalaParams).getOrElse {
Expand Down Expand Up @@ -909,14 +905,6 @@ object Build {
Seq(ScalacOpt("-scalajs"))
else Nil

val scalacReleaseV =
// the -release flag is not supported for Scala 2.12.x < 2.12.5
if params.scalaVersion.asVersion < "2.12.5".asVersion then Nil
else
releaseFlagVersion
.map(v => List("-release", v).map(ScalacOpt(_)))
.getOrElse(Nil)

val scalapyOptions =
if (
params.scalaVersion.startsWith("2.13.") &&
Expand All @@ -931,7 +919,6 @@ object Build {
semanticDbScalacOptions ++
sourceRootScalacOptions ++
scalaJsScalacOptions ++
scalacReleaseV ++
scalapyOptions

val compilerParams = ScalaCompilerParams(
Expand Down Expand Up @@ -973,9 +960,7 @@ object Build {
else
Nil

val javacReleaseV = releaseFlagVersion.map(v => List("--release", v)).getOrElse(Nil)

javacReleaseV ++ semanticDbJavacOptions ++ options.javaOptions.javacOptions.map(_.value)
semanticDbJavacOptions ++ options.javaOptions.javacOptions.map(_.value)
}

// `test` scope should contains class path to main scope
Expand Down Expand Up @@ -1014,7 +999,7 @@ object Build {
resourceDirs = sources.resourceDirs,
scope = scope,
javaHomeOpt = Option(options.javaHomeLocation().value),
javacOptions = javacOptions
javacOptions = javacOptions.toList
)
project
}
Expand Down
Loading