Skip to content

Commit ba99c75

Browse files
committed
Bump FormDesigner module to JDK 17 and adjust javac task
- FormDesigner needs to access the java.awt.peer package - javac ant task should not set --release in that case since it will fail when --add-exports is used on JDK modules - keep AbsoluteLayout.jar on Java 8 level
1 parent 4df0711 commit ba99c75

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

java/form/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<target name="absolute-layout" depends="build-init">
2727
<mkdir dir="${build.dir}/absolutelayoutclasses"/>
28-
<javac srcdir="release/sources" target="${javac.target}" source="${javac.source}" destdir="${build.dir}/absolutelayoutclasses"/>
28+
<javac srcdir="release/sources" release="${absolutelayout.javac.release}" destdir="${build.dir}/absolutelayoutclasses"/>
2929
<mkdir dir="${cluster}/modules/ext"/>
3030
<nb-ext-jar jarfile="${cluster}/modules/ext/AbsoluteLayout.jar">
3131
<manifest>

java/form/nbproject/project.properties

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,17 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18+
19+
# 'error: exporting a package from system module java.desktop is not allowed with --release'
20+
javac.source=17
21+
javac.target=17
22+
23+
absolutelayout.javac.release=8
1824
extra.module.files=modules/ext/AbsoluteLayout.jar
19-
javac.source=1.8
25+
26+
# see o.n.m.form.fakepeer package
27+
javac.compilerargs=--add-exports=java.desktop/java.awt.peer=ALL-UNNAMED
28+
2029
javadoc.arch=${basedir}/arch.xml
2130
spec.version.base=1.88.0
2231
test-unit-sys-prop.org.netbeans.modules.form.layoutdesign.test=0

nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void execute() throws BuildException {
7878
if (tgr.matches("\\d+")) {
7979
tgr = "1." + tgr;
8080
}
81-
if (!isBootclasspathOptionUsed()) {
81+
if (canUseRelease()) {
8282
setRelease(tgr.substring(2));
8383
}
8484
String src = getSource();
@@ -135,13 +135,14 @@ protected void compile() {
135135
super.compile();
136136
}
137137

138-
private boolean isBootclasspathOptionUsed() {
138+
private boolean canUseRelease() {
139+
// 'error: exporting a package from system module java.desktop is not allowed with --release'
139140
for (String arg : getCurrentCompilerArgs()) {
140-
if (arg.contains("-Xbootclasspath")) {
141-
return true;
141+
if (arg.contains("-Xbootclasspath") || arg.contains("--add-exports=java.")) {
142+
return false;
142143
}
143144
}
144-
return false;
145+
return true;
145146
}
146147

147148
/**

0 commit comments

Comments
 (0)