Merge pull request #556 from yermak/development

Major libraries update, some bug-fixes

app/path.properties

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

azure-pipelines.yml

@@ -18,9 +18,9 @@ steps:
 
   - script: |
       choco install wget --no-progress
-      wget -q https://download.java.net/java/GA/jdk17.0.1/2a2082e5a09d4267845be086888add4f/12/GPL/openjdk-17.0.1_windows-x64_bin.zip -O openjdk-17.0.1_windows-x64_bin.zip      
-      7z.exe x openjdk-17.0.1_windows-x64_bin.zip
-      setx JAVA_HOME jdk-17.0.1
+      wget -q https://download.java.net/openjdk/jdk21/ri/openjdk-21+35_windows-x64_bin.zip
+      7z.exe x openjdk-21+35_windows-x64_bin.zip
+      setx JAVA_HOME jdk-21
       call refreshenv
       call mvn -X clean package -Dexec.skip=true --no-transfer-progress $(MAVEN_OPTS)
     displayName: 'Build app without installer'

build/mac/entitlements.plist

@@ -11,6 +11,8 @@
 	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
 	<true/>
 	<key>com.apple.security.app-sandbox</key>
-	<true/>	
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
 </dict>
 </plist>

build/mac/package.sh

@@ -1,7 +1,8 @@
-JAVA_HOME=/Users/Yarick_Yermak/Library/Java/JavaVirtualMachines/temurin-17/Contents/Home
+JAVA_HOME=/Users/yermak/Library/Java/JavaVirtualMachines/azul-21.0.1/Contents/Home
 #JAVA_HOME=$1
-JAVAFX_JMODS=jmods/mac
-APP_VERSION=6.1.2
+#JAVAFX_JMODS=jmods/mac
+JAVAFX_JMODS=jmods/mac_m1
+APP_VERSION=6.2.6
 
 rm -rf target/release
 mkdir target/release