Skip to content

Commit cfa9377

Browse files
committed
Revert "Merge remote-tracking branch 'upstream/main' into mod-changelog"
This reverts commit 36c6661, reversing changes made to 8fed3b7.
1 parent 36c6661 commit cfa9377

File tree

23 files changed

+47
-5479
lines changed

23 files changed

+47
-5479
lines changed

HMCL/build.gradle.kts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,29 +117,26 @@ tasks.checkstyleMain {
117117
exclude("**/org/jackhuang/hmcl/ui/image/apng/**")
118118
}
119119

120+
tasks.compileJava {
121+
options.compilerArgs.add("--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED")
122+
}
123+
120124
val addOpens = listOf(
121125
"java.base/java.lang",
122126
"java.base/java.lang.reflect",
123127
"java.base/jdk.internal.loader",
124128
"javafx.base/com.sun.javafx.binding",
125129
"javafx.base/com.sun.javafx.event",
126130
"javafx.base/com.sun.javafx.runtime",
127-
"javafx.base/javafx.beans.property",
128131
"javafx.graphics/javafx.css",
129-
"javafx.graphics/javafx.stage",
130132
"javafx.graphics/com.sun.javafx.stage",
131-
"javafx.graphics/com.sun.javafx.util",
132133
"javafx.graphics/com.sun.prism",
133134
"javafx.controls/com.sun.javafx.scene.control",
134135
"javafx.controls/com.sun.javafx.scene.control.behavior",
135136
"javafx.controls/javafx.scene.control.skin",
136137
"jdk.attach/sun.tools.attach",
137138
)
138139

139-
tasks.compileJava {
140-
options.compilerArgs.addAll(addOpens.map { "--add-exports=$it=ALL-UNNAMED" })
141-
}
142-
143140
val hmclProperties = buildList {
144141
add("hmcl.version" to project.version.toString())
145142
add("hmcl.add-opens" to addOpens.joinToString(" "))

HMCL/src/main/java/com/jfoenix/controls/JFXClippedPane.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

HMCL/src/main/java/com/jfoenix/controls/JFXColorPicker.java

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)