Skip to content

Commit

Permalink
feat: support java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
TomerAberbach committed Apr 27, 2021
1 parent 5d10361 commit 488e549
Show file tree
Hide file tree
Showing 20 changed files with 134 additions and 8 deletions.
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
*.iml
.idea/
out/
META-INF/
*.jar
target
37 changes: 37 additions & 0 deletions dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.tomeraberbach</groupId>
<artifactId>mano-simulator</artifactId>
<name>mano-simulator</name>
<version>1.0-SNAPSHOT</version>
<url>https://github.com/TomerAberbach/mano-simulator</url>
<build>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer>
<mainClass>com.tomeraberbach.mano.application.SuperMain</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
86 changes: 86 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>com.tomeraberbach</groupId>
<artifactId>mano-simulator</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>mano-simulator</name>
<url>https://github.com/TomerAberbach/mano-simulator</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>15.0.1</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>15.0.1</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>15.0.1</version>
<classifier>linux</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>15.0.1</version>
<classifier>mac</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>15.0.1</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>15.0.1</version>
<classifier>win</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>15.0.1</version>
<classifier>linux</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>15.0.1</version>
<classifier>mac</classifier>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals><goal>shade</goal></goals>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.tomeraberbach.mano.application.SuperMain</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public class Main extends Application {
* Text displayed in the 'About' dialog.
*/
private static final String ABOUT = "Tomer Aberbach\n" +
"aberbat1@tcnj.edu\n" +
"10/30/2018\n" +
"tomeraberbach@gmail.com\n" +
"04/26/2021\n" +
"Students at The College of New Jersey are granted\n" +
"unlimited use and access to this application and\n" +
"its code.";
Expand Down Expand Up @@ -577,7 +577,7 @@ private void exportOnAction() {
@Override
public void start(Stage stage) throws IOException {
// Loads the main application and starts it
FXMLLoader loader = new FXMLLoader(getClass().getResource("main.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("/main.fxml"));
Parent root = loader.load();

Main main = loader.getController();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.tomeraberbach.mano.application;

public class SuperMain {
public static void main(String[] args) {
Main.main(args);
}
}
File renamed without changes.

0 comments on commit 488e549

Please sign in to comment.