Merge pull request #362 from yermak/development

Version 6 initial release

app/path.properties

@@ -1,5 +1,5 @@
-ffmpeg=external/x64/windows/ffmpeg.exe
-ffprobe=external/x64/windows/ffprobe.exe
-mp4art=external/x64/windows/mp4art.exe
-mp4info=external/x64/windows/mp4info.exe
+ffmpeg=external/x64/mac/ffmpeg
+ffprobe=external/x64/mac/ffprobe
+mp4art=external/x64/mac/mp4art
+mp4info=external/x64/mac/mp4info
 platform=steam

idea.txt → build/idea.txt

@@ -1,2 +1,7 @@
 VM Options=--module-path "C:\Users\Yermak\Programs\JavaFX\javafx-sdk-15.0.1\lib" --add-modules javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics
 Enviromnent var=FFMPEG=external/x64/windows
+
+
+https://www.reddit.com/r/gamedev/comments/di61ms/have_a_mac_game_on_steam_heres_a_guide_to_signing/
+
+

build/linux/package.sh

@@ -7,7 +7,7 @@ mkdir target/release
 
 rm -rf target/fx-jre
 $JAVA_HOME/bin/jlink --module-path $JAVA_HOME/jmods:$JAVAFX_JMODS \
---add-modules java.base,java.sql,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics \
+--add-modules java.base,java.sql,java.management,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics \
 --strip-native-commands --strip-debug --no-man-pages --no-header-files --exclude-files=**.md \
 --output target/fx-jre
 

build/mac/package.sh

@@ -0,0 +1,35 @@
+JAVA_HOME=/Users/Yarick_Yermak/Library/Java/JavaVirtualMachines/temurin-17/Contents/Home
+JAVA_HOME=$1
+JAVAFX_JMODS=jmods/mac
+#APP_VERSION=5.6.3
+
+rm -rf target/release
+mkdir target/release
+
+rm -rf target/fx-jre
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/jmods:$JAVAFX_JMODS \
+--add-modules java.base,java.sql,java.management,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics --output target/fx-jre
+
+rm -rf target/image
+$JAVA_HOME/bin/jpackage --app-version $APP_VERSION  --icon AudioBookConverter.icns \
+--type app-image \
+--input target/package/audiobookconverter-$APP_VERSION-mac-installer/audiobookconverter-$APP_VERSION/app \
+--main-jar lib/audiobookconverter-$APP_VERSION.jar \
+--runtime-image target/fx-jre \
+--java-options "--add-exports java.desktop/com.apple.eio=ALL-UNNAMED" \
+--dest target/release \
+--vendor "Recoupler Limited" \
+--app-version $APP_VERSION \
+--mac-package-identifier com.recoupler.audiobookconverter \
+--mac-package-name AudiobookConverter \
+--mac-signing-key-user-name "Developer ID Application: Recoupler Limited" \
+--mac-sign
+
+
+#$JAVA_HOME/bin/jpackage --app-version $(APP_VERSION)  --icon AudioBookConverter.icns \
+#--type dmg \
+#--input target/package/audiobookconverter-$(APP_VERSION)-mac-installer/audiobookconverter-$(APP_VERSION)/app \
+#--main-jar lib/audiobookconverter-$(APP_VERSION).jar --runtime-image target/fx-jre --java-options '--enable-preview'
+#mkdir target/release
+
+

build/windows/package.bat

@@ -10,7 +10,7 @@ ECHO %APP_VERSION%
 mkdir target\release
 rmdir /s /q target\image\AudioBookConverter
 
-"%JAVA_HOME%\bin\jlink.exe" --module-path "%JAVA_HOME%\jmods";%JAVAFX_JMODS% --add-modules java.base,java.sql,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics --strip-native-commands --strip-debug --no-man-pages --no-header-files --exclude-files=**.md --output target\fx-jre
+"%JAVA_HOME%\bin\jlink.exe" --module-path "%JAVA_HOME%\jmods";%JAVAFX_JMODS% --add-modules java.base,java.sql,java.management,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics --strip-native-commands --strip-debug --no-man-pages --no-header-files --exclude-files=**.md --output target\fx-jre
 
 "%JAVA_HOME%\bin\jpackage.exe" --app-version %APP_VERSION%  --icon AudioBookConverter.ico -t app-image --name AudioBookConverter --vendor Recoupler --input target\package\audiobookconverter-%APP_VERSION%-windows-installer\audiobookconverter-%APP_VERSION%\app --main-jar lib\audiobookconverter-%APP_VERSION%.jar --runtime-image target\fx-jre --dest target\image --java-options '--enable-preview'
 cd target\image

build_binaries.yml

@@ -7,7 +7,7 @@ trigger:
 
 
 variables:
-  VERSION: 99.99
+  VERSION: 99.98
   BUILD_COUNTER: $[counter(variables['VERSION'], 0)]
   APP_VERSION: '$(VERSION).$(BUILD_COUNTER)'
 

external/x64/mac/path.properties

@@ -0,0 +1,5 @@
+ffmpeg=Contents/app/external/ffmpeg
+ffprobe=Contents/app/external/ffprobe
+mp4art=Contents/app/external/mp4art
+mp4info=Contents/app/external/mp4info
+platform=steam

pom.xml

@@ -7,9 +7,8 @@
     <groupId>uk.yermak</groupId>
     <artifactId>audiobookconverter</artifactId>
 
-<!--
-    <version>5.5.10</version>
--->
+<!--    <version>5.6.3</version>-->
+
     <version>#{APP_VERSION}#</version>
 
     <properties>
@@ -71,7 +70,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.11.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -84,7 +83,7 @@
         <dependency>
             <groupId>org.controlsfx</groupId>
             <artifactId>controlsfx</artifactId>
-            <version>11.1.0</version>
+            <version>11.1.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.openjfx</groupId>
@@ -96,13 +95,13 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.6</version>
+            <version>2.8.9</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.1.1-jre</version>
+            <version>31.0.1-jre</version>
         </dependency>
 
         <dependency>
@@ -128,6 +127,35 @@
             <version>4.3.1</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.apple/AppleJavaExtensions -->
+        <dependency>
+            <groupId>com.apple</groupId>
+            <artifactId>AppleJavaExtensions</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains.xodus</groupId>
+            <artifactId>xodus-openAPI</artifactId>
+            <version>1.3.232</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.xodus</groupId>
+            <artifactId>xodus-environment</artifactId>
+            <version>1.3.232</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.xodus</groupId>
+            <artifactId>xodus-entity-store</artifactId>
+            <version>1.3.232</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.xodus</groupId>
+            <artifactId>xodus-vfs</artifactId>
+            <version>1.3.232</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
@@ -144,7 +172,7 @@
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.4</version>
                 <configuration>
-                    <mainClass>ConverterApplication</mainClass>
+                    <mainClass>AudioBookConverter</mainClass>
                     <executable>${java.home}\bin\java</executable>
                 </configuration>
             </plugin>
@@ -181,7 +209,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>uk.yermak.audiobookconverter.fx.ConverterApplication</mainClass>
+                            <mainClass>uk.yermak.audiobookconverter.AudiobookConverter</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

release-all.yml

@@ -12,7 +12,7 @@ trigger:
 
 variables:
 #  APP_VERSION: '5.4.$(Build.BuildNumber)'
-  VERSION: 5.6
+  VERSION: 6.0
   BUILD_COUNTER: $[counter(variables['VERSION'], 0)]
   APP_VERSION: '$(VERSION).$(BUILD_COUNTER)'
 

src/main/deploy/assembly/mac-installer.xml

@@ -15,6 +15,22 @@
             </includes>
             <outputDirectory>app</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>external/x64/mac</directory>
+            <outputDirectory>app/external/</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>external/x64/mac</directory>
+            <outputDirectory>app</outputDirectory>
+            <includes>
+                <include>path.properties</include>
+            </includes>
+        </fileSet>
+
+
     </fileSets>
     <dependencySets>
         <dependencySet>