Skip to content

hornor release and target options for non-incremental compile #586

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

Merged
merged 1 commit into from
Apr 3, 2022
Merged

hornor release and target options for non-incremental compile #586

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
13 changes: 7 additions & 6 deletions src/main/java/scala_maven/ScalaMojoSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,11 +497,9 @@ private DependencyNodeFilter createScalaDistroDependencyFilter() throws Exceptio
final JavaMainCaller getScalaCommand(final boolean forkOverride, final String mainClass)
throws Exception {
JavaMainCaller cmd = getEmptyScalaCommand(mainClass, forkOverride);
cmd.addArgs(args);
if (StringUtils.isNotEmpty(addScalacArgs)) {
cmd.addArgs(StringUtils.split(addScalacArgs, "|"));
for (String option : getScalacOptions()) {
cmd.addArgs(option);
}
addCompilerPluginOptions(cmd);
cmd.addJvmArgs(jvmArgs);
return cmd;
}
Expand Down Expand Up @@ -627,8 +625,11 @@ protected List<String> getScalacOptions() throws Exception {
}
}
if (release != null && !release.isEmpty()) {
options.add("-release");
options.add(release);
VersionNumber scalaVersion = findScalaVersion();
if (scalaVersion.major > 2 || (scalaVersion.major == 2 && scalaVersion.minor >= 12)) {
options.add("-release");
options.add(release);
}
}

return options;
Expand Down