Skip to content

Instantly share code, notes, and snippets.

@lptr
Created July 31, 2023 14:02
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save lptr/abfeebfa4e4820d9cc3e433e041a56fe to your computer and use it in GitHub Desktop.
Save lptr/abfeebfa4e4820d9cc3e433e041a56fe to your computer and use it in GitHub Desktop.
diff --git a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/MinimalJavaCompileOptions.java b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/MinimalJavaCompileOptions.java
index 8bd64a34085..9b0f0f7926c 100644
--- a/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/MinimalJavaCompileOptions.java
+++ b/subprojects/language-java/src/main/java/org/gradle/api/internal/tasks/compile/MinimalJavaCompileOptions.java
@@ -53,23 +53,23 @@ public class MinimalJavaCompileOptions implements Serializable {
public MinimalJavaCompileOptions(final CompileOptions compileOptions) {
FileCollection sourcepath = compileOptions.getSourcepath();
this.sourcepath = sourcepath == null ? null : ImmutableList.copyOf(sourcepath.getFiles());
- this.compilerArgs = Lists.newArrayList(compileOptions.getAllCompilerArgs());
- this.encoding = compileOptions.getEncoding();
+ this.compilerArgs = Lists.newArrayList(compileOptions.getAllCompilerArgs().get());
+ this.encoding = compileOptions.getEncoding().getOrNull();
this.bootClasspath = getAsPath(compileOptions.getBootstrapClasspath());
- this.extensionDirs = compileOptions.getExtensionDirs();
- this.forkOptions = new MinimalJavaCompilerDaemonForkOptions(compileOptions.getForkOptions());
- this.debugOptions = compileOptions.getDebugOptions();
- this.debug = compileOptions.isDebug();
- this.deprecation = compileOptions.isDeprecation();
- this.failOnError = compileOptions.isFailOnError();
- this.listFiles = compileOptions.isListFiles();
- this.verbose = compileOptions.isVerbose();
- this.warnings = compileOptions.isWarnings();
+ this.extensionDirs = compileOptions.getExtensionDirs().getOrNull();
+ this.forkOptions = new MinimalJavaCompilerDaemonForkOptions(compileOptions.getForkOptions().get());
+ this.debugOptions = compileOptions.getDebugOptions().get();
+ this.debug = compileOptions.isDebug().get();
+ this.deprecation = compileOptions.isDeprecation().get();
+ this.failOnError = compileOptions.isFailOnError().get();
+ this.listFiles = compileOptions.isListFiles().get();
+ this.verbose = compileOptions.isVerbose().get();
+ this.warnings = compileOptions.isWarnings().get();
this.annotationProcessorGeneratedSourcesDirectory = compileOptions.getGeneratedSourceOutputDirectory().getAsFile().getOrNull();
this.headerOutputDirectory = compileOptions.getHeaderOutputDirectory().getAsFile().getOrNull();
this.javaModuleVersion = compileOptions.getJavaModuleVersion().getOrNull();
this.javaModuleMainClass = compileOptions.getJavaModuleMainClass().getOrNull();
- this.supportsIncrementalCompilationAfterFailure = compileOptions.getIncrementalAfterFailure().getOrElse(false);
+ this.supportsIncrementalCompilationAfterFailure = compileOptions.getIncrementalAfterFailure().get();
}
@Nullable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment