diff options
| author | Reinier Zwitserloot <r.zwitserloot@projectlombok.org> | 2020-10-03 23:56:41 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <r.zwitserloot@projectlombok.org> | 2020-10-03 23:56:41 +0200 |
| commit | 58545cec67ada261d13c454fce460ed55798cd72 (patch) | |
| tree | 8c140dd3d788da876998c10b2d1f2bf9f3e1c91b /src/delombok | |
| parent | 14cce76805324dce66fcdfde333a63c677694d64 (diff) | |
| parent | 4f763367f1092546350324f3040fa84cb0380409 (diff) | |
| download | lombok-58545cec67ada261d13c454fce460ed55798cd72.tar.gz lombok-58545cec67ada261d13c454fce460ed55798cd72.tar.bz2 lombok-58545cec67ada261d13c454fce460ed55798cd72.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java
Diffstat (limited to 'src/delombok')
| -rwxr-xr-x | src/delombok/lombok/delombok/Delombok.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java index a1fd0e56..6c15068a 100755 --- a/src/delombok/lombok/delombok/Delombok.java +++ b/src/delombok/lombok/delombok/Delombok.java @@ -701,8 +701,12 @@ public class Delombok { if (!disablePreview && Javac.getJavaCompilerVersion() >= 11) argsList.add("--enable-preview"); - String[] argv = argsList.toArray(new String[0]); - args.init("javac", argv); + if (Javac.getJavaCompilerVersion() < 15) { + String[] argv = argsList.toArray(new String[0]); + args.init("javac", argv); + } else { + args.init("javac", argsList); + } options.put("diags.legacy", "TRUE"); options.put("allowStringFolding", "FALSE"); } else { |