Browse Source

target java11/javafx11

Seil0 2 months ago
parent
commit
bbfc9521a0

+ 1
- 1
.classpath View File

@@ -19,7 +19,7 @@
19 19
 		</attributes>
20 20
 	</classpathentry>
21 21
 	<classpathentry kind="src" path="src/test/main"/>
22
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
22
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
23 23
 		<attributes>
24 24
 			<attribute name="maven.pomderived" value="true"/>
25 25
 		</attributes>

+ 3
- 3
.settings/org.eclipse.jdt.core.prefs View File

@@ -1,9 +1,9 @@
1 1
 eclipse.preferences.version=1
2 2
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3 3
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
5 5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6
-org.eclipse.jdt.core.compiler.compliance=9
6
+org.eclipse.jdt.core.compiler.compliance=11
7 7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8 8
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
9 9
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11 11
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12 12
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
13 13
 org.eclipse.jdt.core.compiler.release=disabled
14
-org.eclipse.jdt.core.compiler.source=9
14
+org.eclipse.jdt.core.compiler.source=11

+ 254
- 219
pom.xml View File

@@ -1,220 +1,255 @@
1
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
-  <modelVersion>4.0.0</modelVersion>
4
-
5
-  <groupId>com</groupId>
6
-  <artifactId>cemu_UI</artifactId>
7
-  <version>0.3.1-SNAPSHOT</version>
8
-  <packaging>jar</packaging>
9
-  <name>cemu_UI</name>
10
-  <description>cemu_UI is a simple, material design graphical frontend for cemu, a Wii U emulator</description>
11
-  <url>https://www.mosad.xyz</url>
12
-
13
-  <properties>
14
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15
-  </properties>
16
-
17
-  <dependencies>
18
-      
19
-    <dependency>
20
-      <groupId>junit</groupId>
21
-      <artifactId>junit</artifactId>
22
-      <version>4.12</version>
23
-      <scope>test</scope>
24
-    </dependency>
25
-
26
-    <dependency>
27
-        <groupId>com.jfoenix</groupId>
28
-        <artifactId>jfoenix</artifactId>
29
-        <version>9.0.6</version>
30
-    </dependency>
31
-        
32
-    <dependency>
33
-        <groupId>com.eclipsesource.minimal-json</groupId>
34
-        <artifactId>minimal-json</artifactId>
35
-        <version>0.9.5</version>
36
-    </dependency>
37
-        
38
-    <dependency>
39
-        <groupId>org.xerial</groupId>
40
-        <artifactId>sqlite-jdbc</artifactId>
41
-        <version>3.23.1</version>
42
-    </dependency>
43
-	
44
-    <dependency>
45
-        <groupId>org.apache.logging.log4j</groupId>
46
-        <artifactId>log4j-api</artifactId>
47
-        <version>2.11.1</version>
48
-    </dependency>
49
-    
50
-    <dependency>
51
-        <groupId>org.apache.logging.log4j</groupId>
52
-        <artifactId>log4j-core</artifactId>
53
-        <version>2.11.1</version>
54
-    </dependency>
55
-    
56
-    <dependency>
57
-        <groupId>commons-io</groupId>
58
-        <artifactId>commons-io</artifactId>
59
-        <version>2.6</version>
60
-    </dependency>
61
-    
62
-    <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-vfs2 -->
63
-    <dependency>
64
-        <groupId>org.apache.commons</groupId>
65
-        <artifactId>commons-vfs2</artifactId>
66
-        <version>2.2</version>
67
-    </dependency>
68
-    
69
-    <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
70
-    <dependency>
71
-        <groupId>commons-codec</groupId>
72
-        <artifactId>commons-codec</artifactId>
73
-        <version>1.11</version>
74
-    </dependency>
75
-
76
-    <!-- https://mvnrepository.com/artifact/io.datafx/flow -->
77
-    <dependency>
78
-        <groupId>io.datafx</groupId>
79
-        <artifactId>flow</artifactId>
80
-        <version>8.0.1</version>
81
-    </dependency>
82
-
83
-
84
-    <!-- https://mvnrepository.com/artifact/net.lingala.zip4j/zip4j -->
85
-    <dependency>
86
-        <groupId>net.lingala.zip4j</groupId>
87
-        <artifactId>zip4j</artifactId>
88
-        <version>1.3.2</version>
89
-    </dependency>
90
-
91
-    <!-- Google Drive-API libraries-->
92
-    <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
93
-    <dependency>
94
-        <groupId>commons-logging</groupId>
95
-        <artifactId>commons-logging</artifactId>
96
-        <version>1.1.1</version>
97
-    </dependency>
98
-    
99
-    <!-- https://mvnrepository.com/artifact/com.google.api-client/google-api-client -->
100
-    <dependency>
101
-        <groupId>com.google.api-client</groupId>
102
-        <artifactId>google-api-client</artifactId>
103
-        <version>1.25.0</version>
104
-    </dependency>
105
-
106
-    <!-- https://mvnrepository.com/artifact/com.google.apis/google-api-services-drive -->
107
-    <dependency>
108
-        <groupId>com.google.apis</groupId>
109
-        <artifactId>google-api-services-drive</artifactId>
110
-        <version>v3-rev129-1.25.0</version>
111
-    </dependency>
112
-
113
-    <!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client -->
114
-    <dependency>
115
-        <groupId>com.google.http-client</groupId>
116
-        <artifactId>google-http-client</artifactId>
117
-        <version>1.25.0</version>
118
-    </dependency>
119
-    
120
-    <!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client-jackson2 -->
121
-    <dependency>
122
-        <groupId>com.google.http-client</groupId>
123
-        <artifactId>google-http-client-jackson2</artifactId>
124
-        <version>1.25.0</version>
125
-    </dependency>
126
-
127
-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client -->
128
-    <dependency>
129
-        <groupId>com.google.oauth-client</groupId>
130
-        <artifactId>google-oauth-client</artifactId>
131
-        <version>1.25.0</version>
132
-    </dependency>
133
-
134
-
135
-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-java6 -->
136
-    <dependency>
137
-        <groupId>com.google.oauth-client</groupId>
138
-        <artifactId>google-oauth-client-java6</artifactId>
139
-        <version>1.25.0</version>
140
-    </dependency>
141
-
142
-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-jetty -->
143
-    <dependency>
144
-        <groupId>com.google.oauth-client</groupId>
145
-        <artifactId>google-oauth-client-jetty</artifactId>
146
-        <version>1.25.0</version>
147
-    </dependency>
148
-    
149
-    <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
150
-    <dependency>
151
-        <groupId>com.fasterxml.jackson.core</groupId>
152
-        <artifactId>jackson-core</artifactId>
153
-        <version>2.9.6</version>
154
-    </dependency>
155
-
156
-    <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
157
-    <dependency>
158
-        <groupId>javax.servlet</groupId>
159
-        <artifactId>javax.servlet-api</artifactId>
160
-        <version>4.0.1</version>
161
-        <scope>provided</scope>
162
-    </dependency>
163
-
164
-    <!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty -->
165
-    <dependency>
166
-        <groupId>org.mortbay.jetty</groupId>
167
-        <artifactId>jetty</artifactId>
168
-        <version>6.1.26</version>
169
-    </dependency>
170
-    
171
-    <!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty-util -->
172
-    <dependency>
173
-        <groupId>org.mortbay.jetty</groupId>
174
-        <artifactId>jetty-util</artifactId>
175
-        <version>6.1.26</version>
176
-    </dependency>
177
-    
178
-  </dependencies>
179
-  
180
-  <build>
181
-    <plugins>
182
-        
183
-        <plugin> 
184
-            <groupId>org.apache.maven.plugins</groupId>
185
-            <artifactId>maven-compiler-plugin</artifactId> 
186
-            <version>3.8.0</version> 
187
-            <configuration> 
188
-                <source>9</source> 
189
-                <target>9</target> 
190
-                <showWarnings>true</showWarnings> 
191
-                <showDeprecation>true</showDeprecation> 
192
-            </configuration> 
193
-        </plugin>
194
-        
195
-        <plugin>
196
-            <groupId>org.apache.maven.plugins</groupId>
197
-            <artifactId>maven-shade-plugin</artifactId>
198
-            <version>3.1.1</version>
199
-                <executions>
200
-                    <execution>
201
-                    <phase>package</phase>
202
-                    <goals>
203
-                        <goal>shade</goal>
204
-                    </goals>
205
-                    <configuration>
206
-                        <finalName>cemu_UI</finalName>
207
-                        <shadedArtifactAttached>true</shadedArtifactAttached>
208
-                        <transformers>
209
-                            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
210
-                                <mainClass>com.cemu_UI.application.Main</mainClass>
211
-                            </transformer>
212
-                        </transformers>
213
-                    </configuration>
214
-                    </execution>
215
-                </executions>
216
-            </plugin>
217
-        </plugins>
218
-    </build>
219
-    
1
+<project xmlns="http://maven.apache.org/POM/4.0.0"
2
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4
+	<modelVersion>4.0.0</modelVersion>
5
+
6
+	<groupId>com</groupId>
7
+	<artifactId>cemu_UI</artifactId>
8
+	<version>0.3.1-SNAPSHOT</version>
9
+	<packaging>jar</packaging>
10
+	<name>cemu_UI</name>
11
+	<description>cemu_UI is a simple, material design graphical frontend for cemu, a Wii U emulator</description>
12
+	<url>https://www.mosad.xyz</url>
13
+
14
+	<properties>
15
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16
+	</properties>
17
+
18
+	<dependencies>
19
+
20
+		<dependency>
21
+			<groupId>junit</groupId>
22
+			<artifactId>junit</artifactId>
23
+			<version>4.12</version>
24
+			<scope>test</scope>
25
+		</dependency>
26
+
27
+		<dependency>
28
+			<groupId>org.openjfx</groupId>
29
+			<artifactId>javafx-controls</artifactId>
30
+			<version>11</version>
31
+		</dependency>
32
+
33
+		<dependency>
34
+			<groupId>org.openjfx</groupId>
35
+			<artifactId>javafx-fxml</artifactId>
36
+			<version>11</version>
37
+		</dependency>
38
+
39
+		<dependency>
40
+			<groupId>org.openjfx</groupId>
41
+			<artifactId>javafx-media</artifactId>
42
+			<version>11</version>
43
+		</dependency>
44
+
45
+		<dependency>
46
+			<groupId>com.jfoenix</groupId>
47
+			<artifactId>jfoenix</artifactId>
48
+			<version>9.0.6</version>
49
+		</dependency>
50
+
51
+		<dependency>
52
+			<groupId>com.eclipsesource.minimal-json</groupId>
53
+			<artifactId>minimal-json</artifactId>
54
+			<version>0.9.5</version>
55
+		</dependency>
56
+
57
+		<dependency>
58
+			<groupId>org.xerial</groupId>
59
+			<artifactId>sqlite-jdbc</artifactId>
60
+			<version>3.23.1</version>
61
+		</dependency>
62
+
63
+		<dependency>
64
+			<groupId>org.apache.logging.log4j</groupId>
65
+			<artifactId>log4j-api</artifactId>
66
+			<version>2.11.1</version>
67
+		</dependency>
68
+
69
+		<dependency>
70
+			<groupId>org.apache.logging.log4j</groupId>
71
+			<artifactId>log4j-core</artifactId>
72
+			<version>2.11.1</version>
73
+		</dependency>
74
+
75
+		<dependency>
76
+			<groupId>commons-io</groupId>
77
+			<artifactId>commons-io</artifactId>
78
+			<version>2.6</version>
79
+		</dependency>
80
+
81
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-vfs2 -->
82
+		<dependency>
83
+			<groupId>org.apache.commons</groupId>
84
+			<artifactId>commons-vfs2</artifactId>
85
+			<version>2.2</version>
86
+		</dependency>
87
+
88
+		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
89
+		<dependency>
90
+			<groupId>commons-codec</groupId>
91
+			<artifactId>commons-codec</artifactId>
92
+			<version>1.11</version>
93
+		</dependency>
94
+
95
+		<!-- https://mvnrepository.com/artifact/io.datafx/flow -->
96
+		<dependency>
97
+			<groupId>io.datafx</groupId>
98
+			<artifactId>flow</artifactId>
99
+			<version>8.0.1</version>
100
+		</dependency>
101
+
102
+
103
+		<!-- https://mvnrepository.com/artifact/net.lingala.zip4j/zip4j -->
104
+		<dependency>
105
+			<groupId>net.lingala.zip4j</groupId>
106
+			<artifactId>zip4j</artifactId>
107
+			<version>1.3.2</version>
108
+		</dependency>
109
+
110
+		<!-- Google Drive-API libraries -->
111
+		<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
112
+		<dependency>
113
+			<groupId>commons-logging</groupId>
114
+			<artifactId>commons-logging</artifactId>
115
+			<version>1.1.1</version>
116
+		</dependency>
117
+
118
+		<!-- https://mvnrepository.com/artifact/com.google.api-client/google-api-client -->
119
+		<dependency>
120
+			<groupId>com.google.api-client</groupId>
121
+			<artifactId>google-api-client</artifactId>
122
+			<version>1.25.0</version>
123
+		</dependency>
124
+
125
+		<!-- https://mvnrepository.com/artifact/com.google.apis/google-api-services-drive -->
126
+		<dependency>
127
+			<groupId>com.google.apis</groupId>
128
+			<artifactId>google-api-services-drive</artifactId>
129
+			<version>v3-rev129-1.25.0</version>
130
+		</dependency>
131
+
132
+		<!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client -->
133
+		<dependency>
134
+			<groupId>com.google.http-client</groupId>
135
+			<artifactId>google-http-client</artifactId>
136
+			<version>1.25.0</version>
137
+		</dependency>
138
+
139
+		<!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client-jackson2 -->
140
+		<dependency>
141
+			<groupId>com.google.http-client</groupId>
142
+			<artifactId>google-http-client-jackson2</artifactId>
143
+			<version>1.25.0</version>
144
+		</dependency>
145
+
146
+		<!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client -->
147
+		<dependency>
148
+			<groupId>com.google.oauth-client</groupId>
149
+			<artifactId>google-oauth-client</artifactId>
150
+			<version>1.25.0</version>
151
+		</dependency>
152
+
153
+		<!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-java6 -->
154
+		<dependency>
155
+			<groupId>com.google.oauth-client</groupId>
156
+			<artifactId>google-oauth-client-java6</artifactId>
157
+			<version>1.25.0</version>
158
+		</dependency>
159
+
160
+		<!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-jetty -->
161
+		<dependency>
162
+			<groupId>com.google.oauth-client</groupId>
163
+			<artifactId>google-oauth-client-jetty</artifactId>
164
+			<version>1.25.0</version>
165
+		</dependency>
166
+
167
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
168
+		<dependency>
169
+			<groupId>com.fasterxml.jackson.core</groupId>
170
+			<artifactId>jackson-core</artifactId>
171
+			<version>2.9.6</version>
172
+		</dependency>
173
+
174
+		<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
175
+		<dependency>
176
+			<groupId>javax.servlet</groupId>
177
+			<artifactId>javax.servlet-api</artifactId>
178
+			<version>4.0.1</version>
179
+			<scope>provided</scope>
180
+		</dependency>
181
+
182
+		<!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty -->
183
+		<dependency>
184
+			<groupId>org.mortbay.jetty</groupId>
185
+			<artifactId>jetty</artifactId>
186
+			<version>6.1.26</version>
187
+		</dependency>
188
+
189
+		<!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty-util -->
190
+		<dependency>
191
+			<groupId>org.mortbay.jetty</groupId>
192
+			<artifactId>jetty-util</artifactId>
193
+			<version>6.1.26</version>
194
+		</dependency>
195
+
196
+	</dependencies>
197
+
198
+	<build>
199
+		<plugins>
200
+
201
+			<plugin>
202
+				<groupId>org.apache.maven.plugins</groupId>
203
+				<artifactId>maven-compiler-plugin</artifactId>
204
+				<version>3.8.0</version>
205
+				<configuration>
206
+					<source>11</source>
207
+					<target>11</target>
208
+					<showWarnings>true</showWarnings>
209
+					<showDeprecation>true</showDeprecation>
210
+				</configuration>
211
+			</plugin>
212
+			
213
+			<plugin>
214
+				<groupId>org.codehaus.mojo</groupId>
215
+				<artifactId>exec-maven-plugin</artifactId>
216
+				<version>1.6.0</version>
217
+				<executions>
218
+					<execution>
219
+						<goals>
220
+							<goal>java</goal>
221
+						</goals>
222
+					</execution>
223
+				</executions>
224
+				<configuration>
225
+					<mainClass>com.cemu_UI.application.Main</mainClass>
226
+				</configuration>
227
+			</plugin>
228
+
229
+			<plugin>
230
+				<groupId>org.apache.maven.plugins</groupId>
231
+				<artifactId>maven-shade-plugin</artifactId>
232
+				<version>3.1.1</version>
233
+				<executions>
234
+					<execution>
235
+						<phase>package</phase>
236
+						<goals>
237
+							<goal>shade</goal>
238
+						</goals>
239
+						<configuration>
240
+							<finalName>cemu_UI</finalName>
241
+							<shadedArtifactAttached>true</shadedArtifactAttached>
242
+							<transformers>
243
+								<transformer
244
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
245
+									<mainClass>com.cemu_UI.application.JavaFX11Main</mainClass>
246
+								</transformer>
247
+							</transformers>
248
+						</configuration>
249
+					</execution>
250
+				</executions>
251
+			</plugin>
252
+		</plugins>
253
+	</build>
254
+
220 255
 </project>

+ 8
- 0
src/main/java/com/cemu_UI/application/JavaFX11Main.java View File

@@ -0,0 +1,8 @@
1
+package com.cemu_UI.application;
2
+
3
+public class JavaFX11Main {
4
+	
5
+	public static void main(String[] args) {
6
+		Main.main(args);
7
+	}
8
+}

+ 1
- 1
src/main/java/com/cemu_UI/application/Main.java View File

@@ -91,7 +91,7 @@ public class Main extends Application {
91 91
 	private void mainWindow(){
92 92
 		try {
93 93
 			FXMLLoader loader = new FXMLLoader();
94
-			loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml"));
94
+			loader.setLocation(getClass().getResource("/fxml/MainWindow.fxml"));
95 95
 			loader.setController(mainWindowController);
96 96
 			pane = (AnchorPane) loader.load();
97 97
 			primaryStage.setMinWidth(265.00);

Loading…
Cancel
Save