server

Bump JavaFX to 17-EA+12

Download Browse

+9 −9

Author

Debayan Sutradhar (rnayabed) 2021-06-22 12:14

Committer

Debayan Sutradhar (rnayabed) 2021-06-22 12:14

Hash f699b6f6dadecaa8db1856e4707494fdb70e1d56

Parent 8b0d982c20e3931dfa1aba9d5f765dbdea3be773

Reference git #server/f699b6f6dadecaa8db1856e4707494fdb70e1d56

Modified Files

List

Side by side diff

Inline diff

M .github/workflows/build.yml

+6 −6

on:

workflow_run:

workflows: ["Init"]

types:

- completed

jobs:

build-linux:

runs-on: ubuntu-20.04

steps:

- name: Install packages

run: sudo apt install xdg-utils libc6 xdg-utils zlib1g libpng16-16 libasound2 libbsd-dev zip libblkid1 libdbus-1-3 libexpat1 libgpg-error0 liblzma5 libmount1 libpcre3 libselinux1 libsystemd0 libuuid1

- uses: actions/checkout@v2

- name: Setup java

uses: joschi/setup-jdk@v2

with:

java-version: 16

- name: Delete Default.zip

run: |

rm -rf src/main/resources/com/stream_pi/server/Default.zip

- name: Downloading Default.zip ...

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: src/main/resources/com/stream_pi/server

- name: Setup JavaFX

run: |

wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-jmods.zip

wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-jmods.zip

unzip /tmp/openjfx-17-ea+11_linux-x64_bin-jmods.zip -d /tmp

unzip /tmp/openjfx-17-ea+12_linux-x64_bin-jmods.zip -d /tmp

- name: Download built jars

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: target/lib/

- name: Download REQ_MODULES

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Download VERSION

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Add VERSION to environment

run: |

echo "VERSION=$(<version.txt)" >> $GITHUB_ENV

- name: Add REQ_MODULES to environment

run: |

echo "REQ_MODULES=$(<req_modules.txt)" >> $GITHUB_ENV

- name: Create DEB, ZIP

run: |

# Create DEB

.github/scripts/jpackage.sh \

--icon assets/linux-icon.png \

--app-version ${{ env.VERSION }} \

--linux-menu-group "Stream-Pi" \

--license-file LICENSE.txt \

--type deb

# Create App Image

.github/scripts/jpackage.sh \

--icon assets/linux-icon.png \

--app-version ${{ env.VERSION }} \

--type app-image

cd $INSTALL_DIR

mv *.deb stream-pi-server-linux-x64-${{ env.VERSION }}-debian.deb

mv 'Stream-Pi Server' stream-pi-server-${{ env.VERSION }}

zip -r stream-pi-server-linux-x64-${{ env.VERSION }}-executable.zip stream-pi-server-${{ env.VERSION }}

rm -r stream-pi-server-${{ env.VERSION }}

env:

MAIN_CLASS: com.stream_pi.server.Main

JAVAFX_JMODS: /tmp/javafx-jmods-17/

JPACKAGE_HOME: ${{ env.JAVA_HOME }}

INSTALL_DIR: target/install

- name: Saving Linux x64 DEB

uses: actions/upload-artifact@v2

with:

path: target/install/stream-pi-server-linux-x64-${{ env.VERSION }}-debian.deb

- name: Saving Linux x64 ZIP

uses: actions/upload-artifact@v2

with:

path: target/install/stream-pi-server-linux-x64-${{ env.VERSION }}-executable.zip

build-macos:

runs-on: macos-10.15

steps:

- uses: actions/checkout@v2

- name: Setup java

uses: joschi/setup-jdk@v2

with:

java-version: 16

- name: Delete Default.zip

run: |

rm -rf src/main/resources/com/stream_pi/server/Default.zip

- name: Downloading Default.zip ...

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: src/main/resources/com/stream_pi/server

- name: Setup JavaFX

run: |

wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-jmods.zip

wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-jmods.zip

unzip /tmp/openjfx-17-ea+11_linux-x64_bin-jmods.zip -d /tmp

unzip /tmp/openjfx-17-ea+12_linux-x64_bin-jmods.zip -d /tmp

- name: Download built jars

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: target/lib/

- name: Download REQ_MODULES

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Download VERSION

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Add VERSION to environment

run: |

echo "VERSION=$(<version.txt)" >> $GITHUB_ENV

- name: Add REQ_MODULES to environment

run: |

echo "REQ_MODULES=$(<req_modules.txt)" >> $GITHUB_ENV

- name: Create Bundle using JPackage

run: |

# Create DMG

.github/scripts/jpackage.sh \

--icon assets/macos-icon.icns \

--license-file LICENSE.txt \

--type dmg

cd $INSTALL_DIR

mv *.dmg stream-pi-server-macos-x64-${{ env.VERSION }}.dmg

env:

MAIN_CLASS: com.stream_pi.server.Main

JAVAFX_JMODS: /tmp/javafx-jmods-17/

JPACKAGE_HOME: ${{ env.JAVA_HOME }}

INSTALL_DIR: target/install

- name: Saving MacOS x64 DMG

uses: actions/upload-artifact@v2

with:

path: target/install/stream-pi-server-macos-x64-${{ env.VERSION }}.dmg

build-windows:

runs-on: windows-2019

steps:

- uses: actions/checkout@v2

- name: Setup java

uses: joschi/setup-jdk@v2

with:

java-version: 16

- name: Delete Default.zip

run: |

del src/main/resources/com/stream_pi/server/Default.zip

- name: Downloading Default.zip ...

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: src/main/resources/com/stream_pi/server

- name: Download REQ_MODULES

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Download VERSION

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Setup JavaFX

run: |

bitsadmin /Transfer DownsdfloadJavaFX https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_windows-x64_bin-jmods.zip D:\openjfx-17-ea+11_windows-x64_bin-jmods.zip

bitsadmin /Transfer DownsdfloadJavaFX https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_windows-x64_bin-jmods.zip D:\openjfx-17-ea+12_windows-x64_bin-jmods.zip

Expand-Archive -Force D:\openjfx-17-ea+11_windows-x64_bin-jmods.zip D:\

Expand-Archive -Force D:\openjfx-17-ea+12_windows-x64_bin-jmods.zip D:\

- name: Download built jars

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: target/lib/

- name: Create Bundle using JPackage

id: project

shell: cmd

run: |

call .github\scripts\jpackage.bat

env:

MAIN_CLASS: com.stream_pi.server.Main

JAVAFX_JMODS: D:\javafx-jmods-17\

JPACKAGE_HOME: ${{ env.JAVA_HOME }}

INSTALL_DIR: target/install

- name: Saving Windows x64 MSI

uses: actions/upload-artifact@v2

with:

path: target/install/*.msi

M .github/workflows/init.yml

+2 −2

on: [push]

jobs:

init:

runs-on: ubuntu-20.04

steps:

- name: Install packages

run: sudo apt install unzip

- uses: actions/checkout@v2

- name: Setup java

uses: joschi/setup-jdk@v2

with:

java-version: 16

- name: Build actions

run: |

git clone https://github.com/stream-pi/essential-actions

cd essential-actions

make build-all

- name: Move actions to Default.zip

run: |

mv essential-actions/BuiltPlugins/ src/main/resources/com/stream_pi/server/

cd src/main/resources/com/stream_pi/server/

unzip Default.zip -d Default

mv BuiltPlugins/* Default/Plugins/

rm -r BuiltPlugins

rm -rf Default.zip

cd Default

zip -r Default.zip *

mv Default.zip ../

cd ../

rm -r Default

- name: Saving new Default.zip

uses: actions/upload-artifact@v2

with:

path: src/main/resources/com/stream_pi/server/Default.zip

- name: Setup JavaFX

run: |

wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-sdk.zip

wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-sdk.zip

unzip /tmp/openjfx-17-ea+11_linux-x64_bin-sdk.zip -d /tmp

unzip /tmp/openjfx-17-ea+12_linux-x64_bin-sdk.zip -d /tmp

- name: Set Timezone

uses: szenius/set-timezone@v1.0

with:

timezoneLinux: "Asia/Kolkata"

- name: Build Jars

run: |

echo $(date +'%d-%m-%Y %H:%M:%S %Z') > src/main/resources/com/stream_pi/server/build-date

echo Build Date/Time: cat src/main/resources/com/stream_pi/server/build-date

mvn -X package

- name: Save built jars

uses: actions/upload-artifact@v2

with:

path: target/lib/*

- name: Set Version

run: |

echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV

- name: Calculate required modules

run: |

JDEPS_MODULES=$(jdeps --module-path $JAVAFX_SDK/:target/lib/ --print-module-deps --ignore-missing-deps target/lib/server-$VERSION.jar)

JAVAFX_MODULES=javafx.fxml,javafx.media,javafx.swing,javafx.web

EXTRA_MODULES=java.base,java.logging,java.net.http,java.scripting,jdk.jsobject,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom,java.xml,java.management,jdk.localedata,java.sql,jdk.crypto.ec

echo "REQ_MODULES=$EXTRA_MODULES,$JDEPS_MODULES,$JAVAFX_MODULES" >> $GITHUB_ENV

env:

JAVAFX_SDK: /tmp/javafx-sdk-17/lib/

- name: Saving REQ_MODULES

run: |

echo $REQ_MODULES

echo $REQ_MODULES > req_modules.txt

- name: Uploading REQ_MODULES

uses: actions/upload-artifact@v2

with:

path: req_modules.txt

- name: Saving VERSION

run: |

echo $VERSION > version.txt

- name: Uploading VERSION

uses: actions/upload-artifact@v2

with:

path: version.txt

M pom.xml

+1 −1

<?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/xsd/maven-4.0.0.xsd">

<groupId>com.stream-pi</groupId>

<artifactId>server</artifactId>

<version>1.0.0-EA+3-SNAPSHOT</version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>11</maven.compiler.source>

<maven.compiler.target>11</maven.compiler.target>

<gluonfx.plugin.version>1.0.0</gluonfx.plugin.version>

<javafx.version>17-ea+11</javafx.version>

<javafx.version>17-ea+12</javafx.version>

<action.api.version>1.0.0-SNAPSHOT</action.api.version>

<theme.api.version>1.0.0-SNAPSHOT</theme.api.version>

<util.version>1.0.0-SNAPSHOT</util.version>

<controlsfx.version>11.1.0</controlsfx.version>

<commons.bean.util.version>1.9.4</commons.bean.util.version>

<commons.configuration.version>2.7</commons.configuration.version>

<log4j.version>2.14.0</log4j.version>

<ikonli.version>11.5.0</ikonli.version>

<main.class.name>com.stream_pi.server.Main</main.class.name>

<maven.test.skip>true</maven.test.skip>

<source.plugin.version>2.2.1</source.plugin.version>

<javadoc.plugin.version>3.1.0</javadoc.plugin.version>

<gpg.plugin.version>1.6</gpg.plugin.version>

<shade.plugin.version>3.2.4</shade.plugin.version>

<compiler.plugin.version>3.8.1</compiler.plugin.version>

<jar.plugin>2.3.1</jar.plugin>

</properties>

<groupId>org.openjfx</groupId>

<artifactId>javafx-controls</artifactId>

<version>${javafx.version}</version>

</dependency>

<groupId>org.openjfx</groupId>

<artifactId>javafx-media</artifactId>

<version>${javafx.version}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-fontawesome5-pack</artifactId>

<version>${ikonli.version}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-javafx</artifactId>

<version>${ikonli.version}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>action-api</artifactId>

<version>${action.api.version}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<version>${util.version}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>theme-api</artifactId>

<version>${theme.api.version}</version>

</dependency>

<groupId>org.controlsfx</groupId>

<artifactId>controlsfx</artifactId>

<version>${controlsfx.version}</version>

</dependency>

</dependencies>

<id>sonatype-snapshots</id>

<url>https://oss.sonatype.org/content/repositories/snapshots/</url>

</repository>

<id>gluon-releases</id>

<url>http://nexus.gluonhq.com/nexus/content/repositories/releases/</url>

</repository>

</repositories>

<build>

<artifactId>maven-dependency-plugin</artifactId>

<phase>package</phase>

<goals>

<goal>copy-dependencies</goal>

</goals>

<outputDirectory>target/lib</outputDirectory>

<excludeGroupIds>org.openjfx</excludeGroupIds>

</configuration>

</execution>

</executions>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-jar-plugin</artifactId>

<version>${jar.plugin}</version>

<outputDirectory>target/lib/</outputDirectory>

</configuration>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-compiler-plugin</artifactId>

<version>${compiler.plugin.version}</version>

</plugin>

<groupId>org.openjfx</groupId>

<artifactId>javafx-maven-plugin</artifactId>

<commandlineArgs>-DStream-Pi.startupRunnerFileName=run_min -DStream-Pi.startupMode=maximise</commandlineArgs>

<option>-Dprism.verbose=true</option>

<option>-Djavafx.verbose=true</option>

<option>-Dprism.forceGPU=true</option>

</options>

<mainClass>${main.class.name}</mainClass>

</configuration>

</plugin>

<groupId>com.gluonhq</groupId>

<artifactId>gluonfx-maven-plugin</artifactId>

<version>${gluonfx.plugin.version}</version>

<list>--initialize-at-build-time=com.sun.org.apache.xml.internal.serializer.ToXMLStream</list>

</nativeImageArgs>

<list>com.sun.org.apache.xerces.internal.impl.msg.XMLMessages</list>

</bundlesList>

<list>java.util.logging.FileHandler</list>

</reflectionList>

<mainClass>${main.class.name}</mainClass>

</configuration>

</plugin>

<artifactId>maven-resources-plugin</artifactId>

</configuration>

</plugin>

</plugins>

</build>

<id>gluon-releases</id>

<url>http://nexus.gluonhq.com/nexus/content/repositories/releases/</url>

</pluginRepository>

<id>gluon-snapshots</id>

<url>https://nexus.gluonhq.com/nexus/content/repositories/public-snapshots</url>

</pluginRepository>

</pluginRepositories>

<id>release</id>

<build>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-source-plugin</artifactId>

<id>attach-sources</id>

<goals>

</goals>

</execution>

</executions>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-javadoc-plugin</artifactId>

<version>${javadoc.plugin.version}</version>

<id>attach-javadocs</id>

<goals>

</goals>

</execution>

</executions>

</configuration>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-gpg-plugin</artifactId>

<version>${gpg.plugin.version}</version>

<id>sign-artifacts</id>

<phase>verify</phase>

<goals>

</goals>

<arg>--pinentry-mode</arg>

<arg>loopback</arg>

</gpgArguments>

</configuration>

</execution>

</executions>

</plugin>

</plugins>

</build>

</profile>

</profiles>

<name>Stream Pi</name>

<url>https://www.stream-pi.com</url>

</organization>

<system>GitHub</system>

<url>https://github.com/Stream-Pi/client/issues</url>

</issueManagement>

<name>GPL-3.0 License</name>

<url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>

</license>

</licenses>

<name>Debayan Sutradhar</name>

<email>debayansutradhar3@gmail.com</email>

<organization>Stream-Pi</organization>

<organizationUrl>https://www.stream-pi.com</organizationUrl>

</developer>

</developers>

<scm>

<url>https://github.com/stream-pi/client</url>

<connection>scm:git:git://github.com/stream-pi/client.git</connection>

<developerConnection>scm:git:ssh://git@github.com:stream-pi/client.git</developerConnection>

</scm>

<id>ossrh</id>

<url>https://oss.sonatype.org/content/repositories/snapshots</url>

</snapshotRepository>

<id>ossrh</id>

<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>

</repository>

</distributionManagement>

</project>

Public

server

Clone or download

Bump JavaFX to 17-EA+12

Modified Files