File tree 1 file changed +7
-6
lines changed
src/main/java/scala_maven
1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -497,11 +497,9 @@ private DependencyNodeFilter createScalaDistroDependencyFilter() throws Exceptio
497
497
final JavaMainCaller getScalaCommand (final boolean forkOverride , final String mainClass )
498
498
throws Exception {
499
499
JavaMainCaller cmd = getEmptyScalaCommand (mainClass , forkOverride );
500
- cmd .addArgs (args );
501
- if (StringUtils .isNotEmpty (addScalacArgs )) {
502
- cmd .addArgs (StringUtils .split (addScalacArgs , "|" ));
500
+ for (String option : getScalacOptions ()) {
501
+ cmd .addArgs (option );
503
502
}
504
- addCompilerPluginOptions (cmd );
505
503
cmd .addJvmArgs (jvmArgs );
506
504
return cmd ;
507
505
}
@@ -627,8 +625,11 @@ protected List<String> getScalacOptions() throws Exception {
627
625
}
628
626
}
629
627
if (release != null && !release .isEmpty ()) {
630
- options .add ("-release" );
631
- options .add (release );
628
+ VersionNumber scalaVersion = findScalaVersion ();
629
+ if (scalaVersion .major > 2 || (scalaVersion .major == 2 && scalaVersion .minor >= 12 )) {
630
+ options .add ("-release" );
631
+ options .add (release );
632
+ }
632
633
}
633
634
634
635
return options ;
You can’t perform that action at this time.
0 commit comments