@@ -862,10 +862,6 @@ object Build {
862
862
val semanticDbSourceRoot =
863
863
options.scalaOptions.semanticDbOptions.semanticDbSourceRoot.getOrElse(inputs.workspace)
864
864
865
- val releaseFlagVersion =
866
- if (options.useBuildServer.getOrElse(true )) None
867
- else releaseFlag(options, compilerJvmVersionOpt, logger).map(_.toString)
868
-
869
865
val scalaCompilerParamsOpt = artifacts.scalaOpt match {
870
866
case Some (scalaArtifacts) =>
871
867
val params = value(options.scalaParams).getOrElse {
@@ -909,14 +905,6 @@ object Build {
909
905
Seq (ScalacOpt (" -scalajs" ))
910
906
else Nil
911
907
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
-
920
908
val scalapyOptions =
921
909
if (
922
910
params.scalaVersion.startsWith(" 2.13." ) &&
@@ -931,7 +919,6 @@ object Build {
931
919
semanticDbScalacOptions ++
932
920
sourceRootScalacOptions ++
933
921
scalaJsScalacOptions ++
934
- scalacReleaseV ++
935
922
scalapyOptions
936
923
937
924
val compilerParams = ScalaCompilerParams (
@@ -973,9 +960,7 @@ object Build {
973
960
else
974
961
Nil
975
962
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)
979
964
}
980
965
981
966
// `test` scope should contains class path to main scope
@@ -1014,7 +999,7 @@ object Build {
1014
999
resourceDirs = sources.resourceDirs,
1015
1000
scope = scope,
1016
1001
javaHomeOpt = Option (options.javaHomeLocation().value),
1017
- javacOptions = javacOptions
1002
+ javacOptions = javacOptions.toList
1018
1003
)
1019
1004
project
1020
1005
}
0 commit comments