Skip to content

Commit 839cd60

Browse files
Remove broken server configuration option
This option originated from Micronaut Gradle plugin. In Micronaut plugin it is connected to the `verbose` configuration option, and thus broken. As it isn't functional and server building is now disabled by default, it is removed here. This commit also disables JavaDoc timestamp.
1 parent 5cc3aee commit 839cd60

File tree

4 files changed

+1
-24
lines changed

4 files changed

+1
-24
lines changed

build-logic/src/main/kotlin/org.graalvm.build.java.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ tasks.javadoc {
8080
languageVersion.set(JavaLanguageVersion.of(11))
8181
})
8282
(options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
83+
(options as StandardJavadocDocletOptions).noTimestamp(true)
8384
}
8485

8586
tasks.withType<Test>().configureEach {

docs/src/docs/asciidoc/gradle-plugin.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ nativeBuild {
145145
debug = true // Determines if debug info should be generated, defaults to false
146146
verbose = true // Add verbose output, defaults to false
147147
fallback = true // Sets the fallback mode of native-image, defaults to false
148-
server = true // Sets the server mode, defaults to false
149148
sharedLibrary = false // Determines if image is a shared library, defaults to false if `java-library` plugin isn't included
150149

151150
systemProperties = [name1: 'value1', name2: 'value2'] // Sets the system properties to use for the native image builder
@@ -172,7 +171,6 @@ nativeBuild {
172171
debug.set(true) // Determines if debug info should be generated, defaults to false
173172
verbose.set(true) // Add verbose output, defaults to false
174173
fallback.set(true) // Sets the fallback mode of native-image, defaults to false
175-
server.set(true) // Sets the server mode, defaults to false
176174
sharedLibrary.set(false) // Determines if image is a shared library, defaults to false if `java-library` plugin isn't included
177175

178176
systemProperties.putAll(mapOf(name1 to "value1", name2 to "value2")) // Sets the system properties to use for the native image builder

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/dsl/NativeImageOptions.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,6 @@ public abstract class NativeImageOptions {
146146
@Input
147147
public abstract Property<Boolean> getDebug();
148148

149-
/**
150-
* Returns the server property, used to determine if the native image
151-
* build server should be used.
152-
*
153-
* @return the server property
154-
*/
155-
@Input
156-
public abstract Property<Boolean> getServer();
157-
158149
/**
159150
* @return Whether to enable fallbacks (defaults to false).
160151
*/
@@ -214,7 +205,6 @@ public NativeImageOptions(ObjectFactory objectFactory,
214205
JavaToolchainService toolchains,
215206
String defaultImageName) {
216207
getDebug().convention(false);
217-
getServer().convention(false);
218208
getFallback().convention(false);
219209
getVerbose().convention(false);
220210
getAgent().convention(false);
@@ -365,15 +355,4 @@ public NativeImageOptions runtimeArgs(Iterable<?> arguments) {
365355
return this;
366356
}
367357

368-
/**
369-
* Enables server build. Server build is disabled by default.
370-
*
371-
* @param enabled Value which controls whether the server build is enabled.
372-
* @return this
373-
*/
374-
public NativeImageOptions enableServerBuild(boolean enabled) {
375-
getServer().set(enabled);
376-
return this;
377-
}
378-
379358
}

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/NativeImageCommandLineProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public List<String> asArguments() {
104104
appendBooleanOption(cliArgs, options.getDebug(), "-H:GenerateDebugInfo=1");
105105
appendBooleanOption(cliArgs, options.getFallback().map(NEGATE), "--no-fallback");
106106
appendBooleanOption(cliArgs, options.getVerbose(), "--verbose");
107-
appendBooleanOption(cliArgs, options.getServer(), "-Dcom.oracle.graalvm.isaot=true");
108107
appendBooleanOption(cliArgs, options.getSharedLibrary(), "--shared");
109108
if (getOutputDirectory().isPresent()) {
110109
cliArgs.add("-H:Path=" + getOutputDirectory().get());

0 commit comments

Comments
 (0)