Skip to content

Commit 58f5a76

Browse files
authored
fix: try removing release flag (#3119)
1 parent b67eb3e commit 58f5a76

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

modules/build/src/main/scala/scala/build/Build.scala

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -862,10 +862,6 @@ object Build {
862862
val semanticDbSourceRoot =
863863
options.scalaOptions.semanticDbOptions.semanticDbSourceRoot.getOrElse(inputs.workspace)
864864

865-
val releaseFlagVersion =
866-
if (options.useBuildServer.getOrElse(true)) None
867-
else releaseFlag(options, compilerJvmVersionOpt, logger).map(_.toString)
868-
869865
val scalaCompilerParamsOpt = artifacts.scalaOpt match {
870866
case Some(scalaArtifacts) =>
871867
val params = value(options.scalaParams).getOrElse {
@@ -909,14 +905,6 @@ object Build {
909905
Seq(ScalacOpt("-scalajs"))
910906
else Nil
911907

912-
val scalacReleaseV =
913-
// the -release flag is not supported for Scala 2.12.x < 2.12.5
914-
if params.scalaVersion.asVersion < "2.12.5".asVersion then Nil
915-
else
916-
releaseFlagVersion
917-
.map(v => List("-release", v).map(ScalacOpt(_)))
918-
.getOrElse(Nil)
919-
920908
val scalapyOptions =
921909
if (
922910
params.scalaVersion.startsWith("2.13.") &&
@@ -931,7 +919,6 @@ object Build {
931919
semanticDbScalacOptions ++
932920
sourceRootScalacOptions ++
933921
scalaJsScalacOptions ++
934-
scalacReleaseV ++
935922
scalapyOptions
936923

937924
val compilerParams = ScalaCompilerParams(
@@ -973,9 +960,7 @@ object Build {
973960
else
974961
Nil
975962

976-
val javacReleaseV = releaseFlagVersion.map(v => List("--release", v)).getOrElse(Nil)
977-
978-
javacReleaseV ++ semanticDbJavacOptions ++ options.javaOptions.javacOptions.map(_.value)
963+
semanticDbJavacOptions ++ options.javaOptions.javacOptions.map(_.value)
979964
}
980965

981966
// `test` scope should contains class path to main scope
@@ -1014,7 +999,7 @@ object Build {
1014999
resourceDirs = sources.resourceDirs,
10151000
scope = scope,
10161001
javaHomeOpt = Option(options.javaHomeLocation().value),
1017-
javacOptions = javacOptions
1002+
javacOptions = javacOptions.toList
10181003
)
10191004
project
10201005
}

0 commit comments

Comments
 (0)