Skip to content

Commit 3fd5f2c

Browse files
goxr3plusgoxr3plus
committed
Java 17 + Removed Chromium + Updated all dependencies + Fixes
1 parent 97a6fdc commit 3fd5f2c

23 files changed

+226
-225
lines changed

Diff for: ‎pom.xml

+53-53
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.github.goxr3plus</groupId>
88
<artifactId>XR3Player</artifactId>
9-
<version>3.129</version>
9+
<version>3.130</version>
1010

1111

1212
<name>XR3Player</name>
@@ -17,13 +17,13 @@
1717
<packaging>jar</packaging>
1818

1919
<properties>
20-
<maven.compiler.source>12</maven.compiler.source>
21-
<maven.compiler.target>12</maven.compiler.target>
20+
<maven.compiler.source>11</maven.compiler.source>
21+
<maven.compiler.target>11</maven.compiler.target>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<ikonli.version>11.3.4</ikonli.version>
24-
<javafx.version>12.0.2</javafx.version>
25-
<junit.jupiter.version>5.4.2</junit.jupiter.version>
26-
<jave.version>2.6.0</jave.version>
24+
<javafx.version>17.0.2</javafx.version>
25+
<junit.jupiter.version>5.8.2</junit.jupiter.version>
26+
<jave.version>3.2.0</jave.version>
2727
</properties>
2828

2929
<build>
@@ -42,10 +42,10 @@
4242
<artifactId>maven-compiler-plugin</artifactId>
4343
<version>3.8.1</version>
4444
<configuration>
45-
<source>12</source>
46-
<target>12</target>
47-
<release>12</release>
48-
<executable>javac12</executable>
45+
<source>17</source>
46+
<target>17</target>
47+
<release>17</release>
48+
<executable>javac17</executable>
4949
<encoding>UTF-8</encoding>
5050
</configuration>
5151
</plugin>
@@ -106,26 +106,26 @@
106106
</plugin>
107107

108108
<!-- Copy Assemply dependency -->
109-
<plugin>
110-
<artifactId>maven-assembly-plugin</artifactId>
111-
<version>3.1.1</version>
112-
<configuration>
113-
<descriptors>
114-
<descriptor>src/assembly/assembly.xml</descriptor>
115-
</descriptors>
116-
<finalName>XR3Player Update ${project.version}</finalName>
117-
<appendAssemblyId>false</appendAssemblyId>
118-
</configuration>
119-
<executions>
120-
<execution>
121-
<id>create-archive</id>
122-
<phase>package</phase>
123-
<goals>
124-
<goal>single</goal>
125-
</goals>
126-
</execution>
127-
</executions>
128-
</plugin>
109+
<!-- <plugin>-->
110+
<!-- <artifactId>maven-assembly-plugin</artifactId>-->
111+
<!-- <version>3.3.0</version>-->
112+
<!-- <configuration>-->
113+
<!-- <descriptors>-->
114+
<!-- <descriptor>src/assembly/assembly.xml</descriptor>-->
115+
<!-- </descriptors>-->
116+
<!-- <finalName>XR3Player Update ${project.version}</finalName>-->
117+
<!-- <appendAssemblyId>false</appendAssemblyId>-->
118+
<!-- </configuration>-->
119+
<!-- <executions>-->
120+
<!-- <execution>-->
121+
<!-- <id>create-archive</id>-->
122+
<!-- <phase>package</phase>-->
123+
<!-- <goals>-->
124+
<!-- <goal>single</goal>-->
125+
<!-- </goals>-->
126+
<!-- </execution>-->
127+
<!-- </executions>-->
128+
<!-- </plugin>-->
129129

130130
</plugins>
131131
</build>
@@ -135,14 +135,14 @@
135135
<id>jitpack.io</id>
136136
<url>https://jitpack.io</url>
137137
</repository>
138-
<repository>
139-
<id>jcenter</id>
140-
<url>http://jcenter.bintray.com</url>
141-
</repository>
142-
<repository>
143-
<id>com.teamdev</id>
144-
<url>http://maven.teamdev.com/repository/products</url>
145-
</repository>
138+
<!-- <repository>-->
139+
<!-- <id>jcenter</id>-->
140+
<!-- <url>http://jcenter.bintray.com</url>-->
141+
<!-- </repository>-->
142+
<!-- <repository>-->
143+
<!-- <id>com.teamdev</id>-->
144+
<!-- <url>https://maven.teamdev.com/repository/products</url>-->
145+
<!-- </repository>-->
146146
</repositories>
147147

148148
<!-- Dependencies -->
@@ -168,7 +168,7 @@
168168

169169
<dependency>
170170
<groupId>org.openjfx</groupId>
171-
<artifactId>javafx-swing</artifactId>
171+
<artifactId>javafx-swing</artifactId><!---->
172172
<version>${javafx.version}</version>
173173
</dependency>
174174

@@ -218,27 +218,27 @@
218218
</dependency>
219219

220220
<!-- CHROMIUM BROWSER -->
221-
<dependency>
222-
<groupId>com.teamdev.jxbrowser</groupId>
223-
<artifactId>jxbrowser-win64</artifactId>
224-
<version>6.23.1</version>
225-
</dependency>
221+
<!-- <dependency>-->
222+
<!-- <groupId>com.teamdev.jxbrowser</groupId>-->
223+
<!-- <artifactId>jxbrowser-win64</artifactId>-->
224+
<!-- <version>6.23.1</version>-->
225+
<!-- </dependency>-->
226226

227227
<!-- JAVAFX GRAPHICS LIBRARIES -->
228228
<dependency>
229229
<groupId>org.controlsfx</groupId>
230230
<artifactId>controlsfx</artifactId>
231-
<version>11.0.0</version>
231+
<version>11.1.1</version>
232232
</dependency>
233233
<dependency>
234234
<groupId>com.jfoenix</groupId>
235235
<artifactId>jfoenix</artifactId>
236-
<version>9.0.9</version>
236+
<version>9.0.10</version>
237237
</dependency>
238238
<dependency>
239239
<groupId>org.fxmisc.richtext</groupId>
240240
<artifactId>richtextfx</artifactId>
241-
<version>0.10.1</version>
241+
<version>0.10.9</version>
242242
</dependency>
243243

244244
<!-- JNative Hook -->
@@ -259,12 +259,12 @@
259259
<dependency>
260260
<groupId>commons-io</groupId>
261261
<artifactId>commons-io</artifactId>
262-
<version>2.7</version>
262+
<version>2.11.0</version>
263263
</dependency>
264264
<dependency>
265265
<groupId>commons-validator</groupId>
266266
<artifactId>commons-validator</artifactId>
267-
<version>1.6</version>
267+
<version>1.7</version>
268268
<exclusions>
269269
<exclusion>
270270
<groupId>*</groupId> <!-- Exclude Project-E from Project-B -->
@@ -278,7 +278,7 @@
278278
<!-- jsoup HTML parser library @ https://jsoup.org/ -->
279279
<groupId>org.jsoup</groupId>
280280
<artifactId>jsoup</artifactId>
281-
<version>1.14.2</version>
281+
<version>1.14.3</version>
282282
</dependency>
283283
<!-- <dependency> <groupId>com.github.cliftonlabs</groupId> <artifactId>json-simple</artifactId>
284284
<version>3.0.2</version> </dependency> -->
@@ -287,7 +287,7 @@
287287
<dependency>
288288
<groupId>org.json</groupId>
289289
<artifactId>json</artifactId>
290-
<version>20180130</version>
290+
<version>20220320</version>
291291
</dependency>
292292

293293
<!-- JAVA-GOOGLE-SPEECH-API -->
@@ -334,7 +334,7 @@
334334
<dependency>
335335
<groupId>org.atteo</groupId>
336336
<artifactId>evo-inflector</artifactId>
337-
<version>1.2.2</version>
337+
<version>1.3</version>
338338
</dependency>
339339

340340
<!-- JAVE2 -->
@@ -385,7 +385,7 @@
385385
<dependency>
386386
<groupId>org.zeroturnaround</groupId>
387387
<artifactId>zt-zip</artifactId>
388-
<version>1.13</version>
388+
<version>1.14</version>
389389
<type>jar</type>
390390
</dependency>
391391

Diff for: ‎src/main/java/com/goxr3plus/xr3player/controllers/chromium/ChromiumFullScreenController.java renamed to ‎releases/futurecode/chromium/ChromiumFullScreenController.java

File renamed without changes.

Diff for: ‎src/main/java/com/goxr3plus/xr3player/controllers/chromium/WebBrowserController.java renamed to ‎releases/futurecode/chromium/WebBrowserController.java

File renamed without changes.

Diff for: ‎src/main/java/com/goxr3plus/xr3player/controllers/chromium/WebBrowserTabContextMenu.java renamed to ‎releases/futurecode/chromium/WebBrowserTabContextMenu.java

File renamed without changes.

Diff for: ‎src/main/java/com/goxr3plus/xr3player/controllers/chromium/WebBrowserTabController.java renamed to ‎releases/futurecode/chromium/WebBrowserTabController.java

File renamed without changes.

Diff for: ‎src/main/java/com/goxr3plus/xr3player/application/Main.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.logging.Logger;
55

66
import com.goxr3plus.fxborderlessscene.borderless.BorderlessScene;
7-
import com.goxr3plus.xr3player.controllers.chromium.WebBrowserController;
7+
//import com.goxr3plus.xr3player.controllers.chromium.WebBrowserController;
88
import com.goxr3plus.xr3player.controllers.djmode.DJMode;
99
import com.goxr3plus.xr3player.controllers.dropbox.DropboxDownloadsTableViewer;
1010
import com.goxr3plus.xr3player.controllers.dropbox.DropboxViewer;
@@ -83,7 +83,7 @@ public static void main(final String[] args) {
8383
DatabaseTool.getAbsoluteDatabasePathWithSeparator() + "ApplicationProperties.properties", true);
8484

8585
// Internal Information
86-
public static final int APPLICATION_VERSION = 129;
86+
public static final int APPLICATION_VERSION = 130;
8787
public static final String RELEASE_DATE = "Check updates window";
8888

8989
private static final Logger[] pin;
@@ -209,7 +209,7 @@ public static void main(final String[] args) {
209209
/**
210210
* The WebBrowser of the Application
211211
*/
212-
public static WebBrowserController webBrowser;
212+
// public static WebBrowserController webBrowser;
213213

214214
//
215215

Diff for: ‎src/main/java/com/goxr3plus/xr3player/application/MainExit.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ public static void terminateXR3Player(final int exitCode) {
9292
case WINDOWS:
9393
new Thread(() -> {
9494
// Disposing all Browsers...
95-
Main.webBrowser.disposeAllBrowsers();
95+
// Main.webBrowser.disposeAllBrowsers();
9696
System.exit(exitCode);
9797
}).start();
9898
break;
9999
case LINUX:
100100
case MAC:
101101
Platform.runLater(() -> {
102102
// Disposing all Browsers...
103-
Main.webBrowser.disposeAllBrowsers();
103+
// Main.webBrowser.disposeAllBrowsers();
104104
System.exit(exitCode);
105105
});
106106
break;

Diff for: ‎src/main/java/com/goxr3plus/xr3player/application/MainLoader.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.Properties;
1111

1212
import com.goxr3plus.fxborderlessscene.borderless.BorderlessScene;
13-
import com.goxr3plus.xr3player.controllers.chromium.WebBrowserController;
13+
//import com.goxr3plus.xr3player.controllers.chromium.WebBrowserController;
1414
import com.goxr3plus.xr3player.controllers.djmode.DJMode;
1515
import com.goxr3plus.xr3player.controllers.dropbox.DropboxDownloadsTableViewer;
1616
import com.goxr3plus.xr3player.controllers.dropbox.DropboxViewer;
@@ -54,7 +54,7 @@
5454
import com.goxr3plus.xr3player.utils.io.IOAction;
5555
import com.goxr3plus.xr3player.utils.io.IOInfo;
5656
import com.goxr3plus.xr3player.utils.javafx.JavaFXTool;
57-
import com.teamdev.jxbrowser.chromium.bb;
57+
//import com.teamdev.jxbrowser.chromium.bb;
5858

5959
import javafx.application.Platform;
6060
import javafx.beans.binding.Bindings;
@@ -350,29 +350,29 @@ public static void startPart2() {
350350

351351
// Load some lol images from lol base
352352
final Thread browserThread = new Thread(() -> {
353-
try {
354-
final Field e = bb.class.getDeclaredField("e");
355-
// e.setAccessible(true);
356-
final Field f = bb.class.getDeclaredField("f");
357-
// f.setAccessible(true);
358-
makeNonFinal(e);
359-
makeNonFinal(f);
360-
// final Field modifersField = Field.class.getDeclaredField("modifiers");
361-
// modifersField.setAccessible(true);
362-
// modifersField.setInt(e, ~Modifier.FINAL & e.getModifiers());
363-
// modifersField.setInt(f, ~Modifier.FINAL & f.getModifiers());
364-
e.set(null, BigInteger.valueOf(1));
365-
f.set(null, BigInteger.valueOf(1));
366-
// modifersField.setAccessible(false);
367-
} catch (final Exception e1) {
368-
e1.printStackTrace();
369-
}
353+
// try {
354+
// final Field e = bb.class.getDeclaredField("e");
355+
//// e.setAccessible(true);
356+
// final Field f = bb.class.getDeclaredField("f");
357+
//// f.setAccessible(true);
358+
// makeNonFinal(e);
359+
// makeNonFinal(f);
360+
//// final Field modifersField = Field.class.getDeclaredField("modifiers");
361+
//// modifersField.setAccessible(true);
362+
//// modifersField.setInt(e, ~Modifier.FINAL & e.getModifiers());
363+
//// modifersField.setInt(f, ~Modifier.FINAL & f.getModifiers());
364+
// e.set(null, BigInteger.valueOf(1));
365+
// f.set(null, BigInteger.valueOf(1));
366+
//// modifersField.setAccessible(false);
367+
// } catch (final Exception e1) {
368+
// e1.printStackTrace();
369+
// }
370370

371371
// Run on JavaFX Thread
372372
Platform.runLater(() -> {
373373

374374
// Chromium Web Browser
375-
Main.webBrowser = new WebBrowserController();
375+
// Main.webBrowser = new WebBrowserController();
376376

377377
// Dropbox Viewer
378378
Main.dropBoxViewer = new DropboxViewer();

0 commit comments

Comments
 (0)