Merge pull request #296 from yermak/development

Fixing issue #291
yermak · Aug 22, 2021 · 725921e · 725921e
2 parents c0280a7 + 5bf161e
commit 725921e
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 23 deletions.
diff --git a/build_binaries.yml b/build_binaries.yml
@@ -45,9 +45,7 @@ jobs:
         sudo apt-get install ffmpeg
         sudo apt-get install mp4v2-utils
         export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64
-        wget -q https://gluonhq.com/download/javafx-16-jmods-linux/ -O openjfx-16_linux-x64_bin-jmods.zip
-        unzip openjfx-16_linux-x64_bin-jmods.zip
-        export JAVAFX_JMODS=javafx-jmods-16
+        export JAVAFX_JMODS=jmods/linux
         mvn clean package --no-transfer-progress
 
         build/linux/package.sh $JAVA_HOME $JAVAFX_JMODS $(APP_VERSION)
@@ -63,10 +61,8 @@ jobs:
         export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-16.0.2.jdk/Contents/Home
         brew install ffmpeg
         brew install mp4v2
-        wget -q https://gluonhq.com/download/javafx-16-jmods-mac/ -O openjfx-16_osx-x64_bin-jmods.zip
-        unzip openjfx-16_osx-x64_bin-jmods.zip
-        rm openjfx-16_osx-x64_bin-jmods.zip
-        export JAVAFX_JMODS=javafx-jmods-16
+        export JAVAFX_JMODS=jmods/mac
+
         mvn clean package --no-transfer-progress
 
         $JAVA_HOME/bin/jlink --module-path $JAVA_HOME/jmods:$JAVAFX_JMODS \
@@ -91,11 +87,9 @@ jobs:
         7z.exe x openjdk-16.0.2_windows-x64_bin.zip
         setx JAVA_HOME jdk-16.0.2
         call refreshenv
-        wget -q https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
-        7z.exe x openjfx-16_windows-x64_bin-jmods.zip
-        SET JAVAFX_JMODS=javafx-jmods-16
+        SET JAVAFX_JMODS=jmods/windows
 
-        call mvn -X clean package --no-transfer-progress
+        call mvn clean package --no-transfer-progress
 
         call build/windows/package.bat "%JAVA_HOME%" %JAVAFX_JMODS% $(APP_VERSION)
 

diff --git a/jmods/linux/javafx.base.jmod b/jmods/linux/javafx.base.jmod
diff --git a/jmods/linux/javafx.controls.jmod b/jmods/linux/javafx.controls.jmod
diff --git a/jmods/linux/javafx.fxml.jmod b/jmods/linux/javafx.fxml.jmod
diff --git a/jmods/linux/javafx.graphics.jmod b/jmods/linux/javafx.graphics.jmod
diff --git a/jmods/linux/javafx.media.jmod b/jmods/linux/javafx.media.jmod
diff --git a/jmods/linux/javafx.swing.jmod b/jmods/linux/javafx.swing.jmod
diff --git a/jmods/linux/javafx.web.jmod b/jmods/linux/javafx.web.jmod
diff --git a/jmods/mac/javafx.base.jmod b/jmods/mac/javafx.base.jmod
diff --git a/jmods/mac/javafx.controls.jmod b/jmods/mac/javafx.controls.jmod
diff --git a/jmods/mac/javafx.fxml.jmod b/jmods/mac/javafx.fxml.jmod
diff --git a/jmods/mac/javafx.graphics.jmod b/jmods/mac/javafx.graphics.jmod
diff --git a/jmods/mac/javafx.media.jmod b/jmods/mac/javafx.media.jmod
diff --git a/jmods/mac/javafx.swing.jmod b/jmods/mac/javafx.swing.jmod
diff --git a/jmods/mac/javafx.web.jmod b/jmods/mac/javafx.web.jmod
diff --git a/jmods/windows/javafx.base.jmod b/jmods/windows/javafx.base.jmod
diff --git a/jmods/windows/javafx.controls.jmod b/jmods/windows/javafx.controls.jmod
diff --git a/jmods/windows/javafx.fxml.jmod b/jmods/windows/javafx.fxml.jmod
diff --git a/jmods/windows/javafx.graphics.jmod b/jmods/windows/javafx.graphics.jmod
diff --git a/jmods/windows/javafx.media.jmod b/jmods/windows/javafx.media.jmod
diff --git a/jmods/windows/javafx.swing.jmod b/jmods/windows/javafx.swing.jmod
diff --git a/jmods/windows/javafx.web.jmod b/jmods/windows/javafx.web.jmod
diff --git a/release-all.yml b/release-all.yml
@@ -48,9 +48,7 @@ jobs:
         sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
         sudo apt-get install adoptopenjdk-16-hotspot
         export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64
-        wget -q https://gluonhq.com/download/javafx-16-jmods-linux/ -O openjfx-16_linux-x64_bin-jmods.zip
-        unzip openjfx-16_linux-x64_bin-jmods.zip
-        export JAVAFX_JMODS=javafx-jmods-16
+        export JAVAFX_JMODS=jmods/linux
         mvn clean package --no-transfer-progress
 
         build/linux/package.sh $JAVA_HOME $JAVAFX_JMODS $(APP_VERSION)
@@ -66,10 +64,7 @@ jobs:
         export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-16.0.2.jdk/Contents/Home
         brew install ffmpeg
         brew install mp4v2
-        wget -q https://gluonhq.com/download/javafx-16-jmods-mac/ -O openjfx-16_osx-x64_bin-jmods.zip
-        unzip openjfx-16_osx-x64_bin-jmods.zip
-        rm openjfx-16_osx-x64_bin-jmods.zip
-        export JAVAFX_JMODS=javafx-jmods-16
+        export JAVAFX_JMODS=jmods/mac
         mvn clean package --no-transfer-progress
 
         $JAVA_HOME/bin/jlink --module-path $JAVA_HOME/jmods:$JAVAFX_JMODS \
@@ -94,11 +89,9 @@ jobs:
         7z.exe x openjdk-16.0.2_windows-x64_bin.zip
         setx JAVA_HOME jdk-16.0.2
         call refreshenv
-        wget https://gluonhq.com/download/javafx-16-jmods-windows/ -O openjfx-16_windows-x64_bin-jmods.zip
-        7z.exe x openjfx-16_windows-x64_bin-jmods.zip
-        SET JAVAFX_JMODS=javafx-jmods-16
+        SET JAVAFX_JMODS=jmods/windows
 
-        call mvn -X clean package --no-transfer-progress
+        call mvn clean package --no-transfer-progress
 
         call build/windows/package.bat "%JAVA_HOME%" %JAVAFX_JMODS% $(APP_VERSION)
 

diff --git a/src/main/java/uk/yermak/audiobookconverter/fx/ConversionContext.java b/src/main/java/uk/yermak/audiobookconverter/fx/ConversionContext.java
@@ -99,7 +99,7 @@ public ConversionGroup detach() {
         conversionGroup.setPosters(new ArrayList<>(posters));
         conversionGroup.setBook(book.get());
         conversionGroup.setBookInfo(bookInfo.get());
-        conversionGroup.setOutputParameters(outputParameters.get());
+        conversionGroup.setOutputParameters(new OutputParameters(outputParameters.get()));
         conversionGroup.setDetached(true);
 
         ConversionGroup newConversionGroup = new ConversionGroup();