Skip to content

Commit

Permalink
Merge pull request #3 from Supernova1114/dev
Browse files Browse the repository at this point in the history
Updated application to use Java 23
  • Loading branch information
Supernova1114 authored Jan 5, 2025
2 parents d46cd16 + 3c4e78e commit d93c2fa
Show file tree
Hide file tree
Showing 11 changed files with 884 additions and 775 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build_tools/jpackage-notes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jpackage --name OsuMP3 --app-version 0.7.2 --type exe --input . --dest . --main-jar OsuMP3-0.7.2.jar --main-class Main --win-dir-chooser --win-shortcut-prompt --win-shortcut --win-menu
24 changes: 24 additions & 0 deletions build_tools/launch4j-config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<launch4jConfig>
<dontWrapJar>true</dontWrapJar>
<headerType>gui</headerType>
<jar>OsuMP3.jar</jar>
<outfile>D:\Projects\Osu-MP3\target\OsuMP3.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir>.</chdir>
<priority>normal</priority>
<downloadUrl>https://jdk.java.net/23/</downloadUrl>
<supportUrl></supportUrl>
<stayAlive>false</stayAlive>
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
<icon></icon>
<jre>
<path>%JAVA_HOME%;%PATH%</path>
<requiresJdk>false</requiresJdk>
<requires64Bit>false</requires64Bit>
<minVersion></minVersion>
<maxVersion></maxVersion>
</jre>
</launch4jConfig>
1 change: 1 addition & 0 deletions build_tools/start.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"C:\Program Files\Java\jdk-23.0.1\bin\java.exe" -jar OsuMP3-0.7.2.jar
84 changes: 82 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,104 @@
<artifactId>jkeymaster</artifactId>
<version>1.3</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.13</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>23.0.1</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-media</artifactId>
<version>23.0.1</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>23.0.1</version>
</dependency>

</dependencies>

<build>
<plugins>
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin &ndash;&gt;-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
<!-- <version>3.3</version>-->

<!-- <configuration>-->
<!-- <source>1.8</source>-->
<!-- <target>1.8</target>-->
<!-- </configuration>-->
<!-- </plugin>-->

<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.8</version>
<configuration>
<mainClass>HelloFX</mainClass>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.8.0</version>
<configuration>
<release>10</release>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>Main</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>Main</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>


</plugins>
</build>

Expand Down
Loading

0 comments on commit d93c2fa

Please sign in to comment.