Skip to content

Commit 98927f6

Browse files
Add jvmArgs for CommandsV3 (#819)
Fixes #812 Co-authored-by: Thad House <thadhouse1@gmail.com>
1 parent 6c2701d commit 98927f6

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

src/main/java/org/wpilib/gradlerio/deploy/systemcore/FIRSTJavaArtifact.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ public FIRSTJavaArtifact(String name, SystemCore target) {
3636
systemCore = target;
3737

3838
jvmArgs.add("-Djava.library.path=" + FIRSTDeployPlugin.LIB_DEPLOY_DIR);
39+
jvmArgs.add("--add-opens");
40+
jvmArgs.add("java.base/jdk.internal.vm=ALL-UNNAMED");
41+
jvmArgs.add("--add-opens");
42+
jvmArgs.add("java.base/java.lang=ALL-UNNAMED");
3943

4044
var debugConfiguration = target.getProject().getConfigurations().create("systemcoreDebug");
4145
var releaseConfiguration = target.getProject().getConfigurations().create("systemcoreRelease");

src/main/java/org/wpilib/gradlerio/wpi/java/WPIJavaExtension.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.wpilib.gradlerio.wpi.java;
22

33
import java.io.File;
4+
import java.util.ArrayList;
45
import java.util.List;
56
import java.util.Map;
67
import java.util.Optional;
@@ -116,9 +117,15 @@ public TaskProvider<JavaSimulationTask> getSimulationTaskRelease() {
116117
private void configureSimulationTask(JavaSimulationTask t, boolean debug,
117118
Provider<ExtractNativeJavaArtifacts> extract) {
118119
configureExecutableNatives(t, extract);
120+
List<String> jvmArgs = new ArrayList<>();
121+
jvmArgs.add("--add-opens");
122+
jvmArgs.add("java.base/jdk.internal.vm=ALL-UNNAMED");
123+
jvmArgs.add("--add-opens");
124+
jvmArgs.add("java.base/java.lang=ALL-UNNAMED");
119125
if (OperatingSystem.current().isMacOsX()) {
120-
t.jvmArgs("-XstartOnFirstThread");
126+
jvmArgs.add("-XstartOnFirstThread");
121127
}
128+
t.jvmArgs(jvmArgs);
122129

123130
t.doFirst(new Action<Task>() {
124131

0 commit comments

Comments
 (0)