Skip to content

Commit 488e549

Browse files
TomerAberbachTomerAberbach
committed
feat: support java 11
1 parent 5d10361 commit 488e549

File tree

20 files changed

+134
-8
lines changed

20 files changed

+134
-8
lines changed

‎.gitignore‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
*.iml
2-
.idea/
3-
out/
4-
META-INF/
5-
*.jar
1+
target

‎dependency-reduced-pom.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.tomeraberbach</groupId>
5+
<artifactId>mano-simulator</artifactId>
6+
<name>mano-simulator</name>
7+
<version>1.0-SNAPSHOT</version>
8+
<url>https://github.com/TomerAberbach/mano-simulator</url>
9+
<build>
10+
<plugins>
11+
<plugin>
12+
<artifactId>maven-shade-plugin</artifactId>
13+
<version>3.2.4</version>
14+
<executions>
15+
<execution>
16+
<phase>package</phase>
17+
<goals>
18+
<goal>shade</goal>
19+
</goals>
20+
<configuration>
21+
<transformers>
22+
<transformer>
23+
<mainClass>com.tomeraberbach.mano.application.SuperMain</mainClass>
24+
</transformer>
25+
</transformers>
26+
</configuration>
27+
</execution>
28+
</executions>
29+
</plugin>
30+
</plugins>
31+
</build>
32+
<properties>
33+
<maven.compiler.target>11</maven.compiler.target>
34+
<maven.compiler.source>11</maven.compiler.source>
35+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36+
</properties>
37+
</project>

‎pom.xml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
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/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.tomeraberbach</groupId>
5+
<artifactId>mano-simulator</artifactId>
6+
<version>1.0-SNAPSHOT</version>
7+
<packaging>jar</packaging>
8+
<name>mano-simulator</name>
9+
<url>https://github.com/TomerAberbach/mano-simulator</url>
10+
11+
<properties>
12+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13+
<maven.compiler.source>11</maven.compiler.source>
14+
<maven.compiler.target>11</maven.compiler.target>
15+
</properties>
16+
<dependencies>
17+
<dependency>
18+
<groupId>org.openjfx</groupId>
19+
<artifactId>javafx-controls</artifactId>
20+
<version>15.0.1</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.openjfx</groupId>
24+
<artifactId>javafx-controls</artifactId>
25+
<version>15.0.1</version>
26+
<classifier>win</classifier>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.openjfx</groupId>
30+
<artifactId>javafx-controls</artifactId>
31+
<version>15.0.1</version>
32+
<classifier>linux</classifier>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.openjfx</groupId>
36+
<artifactId>javafx-controls</artifactId>
37+
<version>15.0.1</version>
38+
<classifier>mac</classifier>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.openjfx</groupId>
42+
<artifactId>javafx-fxml</artifactId>
43+
<version>15.0.1</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.openjfx</groupId>
47+
<artifactId>javafx-fxml</artifactId>
48+
<version>15.0.1</version>
49+
<classifier>win</classifier>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.openjfx</groupId>
53+
<artifactId>javafx-fxml</artifactId>
54+
<version>15.0.1</version>
55+
<classifier>linux</classifier>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.openjfx</groupId>
59+
<artifactId>javafx-fxml</artifactId>
60+
<version>15.0.1</version>
61+
<classifier>mac</classifier>
62+
</dependency>
63+
</dependencies>
64+
<build>
65+
<plugins>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-shade-plugin</artifactId>
69+
<version>3.2.4</version>
70+
<executions>
71+
<execution>
72+
<phase>package</phase>
73+
<goals><goal>shade</goal></goals>
74+
<configuration>
75+
<transformers>
76+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
77+
<mainClass>com.tomeraberbach.mano.application.SuperMain</mainClass>
78+
</transformer>
79+
</transformers>
80+
</configuration>
81+
</execution>
82+
</executions>
83+
</plugin>
84+
</plugins>
85+
</build>
86+
</project>

‎src/com/tomeraberbach/mano/Utilities.java‎ renamed to ‎src/main/java/com/tomeraberbach/mano/Utilities.java‎

File renamed without changes.

‎src/com/tomeraberbach/mano/application/Code.java‎ renamed to ‎src/main/java/com/tomeraberbach/mano/application/Code.java‎

File renamed without changes.

‎src/com/tomeraberbach/mano/application/Main.java‎ renamed to ‎src/main/java/com/tomeraberbach/mano/application/Main.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public class Main extends Application {
4040
* Text displayed in the 'About' dialog.
4141
*/
4242
private static final String ABOUT = "Tomer Aberbach\n" +
43-
"[email protected]\n" +
44-
"10/30/2018\n" +
43+
"[email protected]\n" +
44+
"04/26/2021\n" +
4545
"Students at The College of New Jersey are granted\n" +
4646
"unlimited use and access to this application and\n" +
4747
"its code.";
@@ -577,7 +577,7 @@ private void exportOnAction() {
577577
@Override
578578
public void start(Stage stage) throws IOException {
579579
// Loads the main application and starts it
580-
FXMLLoader loader = new FXMLLoader(getClass().getResource("main.fxml"));
580+
FXMLLoader loader = new FXMLLoader(getClass().getResource("/main.fxml"));
581581
Parent root = loader.load();
582582

583583
Main main = loader.getController();

‎src/main/java/com/tomeraberbach/mano/application/SuperMain.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.tomeraberbach.mano.application;
2+
3+
public class SuperMain {
4+
public static void main(String[] args) {
5+
Main.main(args);
6+
}
7+
}

‎src/com/tomeraberbach/mano/assembly/Compiler.java‎ renamed to ‎src/main/java/com/tomeraberbach/mano/assembly/Compiler.java‎

File renamed without changes.

‎src/com/tomeraberbach/mano/assembly/Instruction.java‎ renamed to ‎src/main/java/com/tomeraberbach/mano/assembly/Instruction.java‎

File renamed without changes.

‎src/com/tomeraberbach/mano/assembly/Label.java‎ renamed to ‎src/main/java/com/tomeraberbach/mano/assembly/Label.java‎

File renamed without changes.

0 commit comments

Comments
 (0)