Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,23 @@ jobs:
retry_wait_seconds: '30'
command: |
Core/src/main/resources/yt-dlp.exe -U
- name: Set up GraalVM JDK 21
- name: Set up GraalVM JDK 23
if: ${{ matrix.mode == 'CLI' }}
uses: graalvm/setup-graalvm@v1
with:
java-version: '21'
java-version: '23'
distribution: 'graalvm'
github-token: ${{ secrets.GITHUB_TOKEN }}
set-java-home: true
cache: 'maven'
- name: Set up Gluon's GraalVM JDK 23
if: ${{ matrix.mode == 'GUI' }}
uses: gluonhq/setup-graalvm@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
arch: ${{ matrix.os == 'macos-14' && 'aarch64' || 'x86_64' }}
jdk: 'java23'
- name: Package Drifty CLI for ${{ matrix.os }} with GraalVM
if: ${{ matrix.mode == 'CLI' }}
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
languages: ${{ matrix.language }}
queries: security-extended,security-and-quality

- name: Setup JDK 21
- name: Setup JDK 23
if: ${{ matrix.language == 'java-kotlin' }}
uses: actions/setup-java@v4
with:
distribution: 'oracle'
java-version: 21
java-version: 23

- name: Build with Maven
if: ${{ matrix.language == 'java-kotlin' }}
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,23 @@ jobs:
run: |
chmod +x Core/src/main/resources/yt-dlp
Core/src/main/resources/yt-dlp -U
- name: Set up GraalVM JDK 21
- name: Set up GraalVM JDK 23
if: ${{ matrix.docker_context == 'CLI' }}
uses: graalvm/setup-graalvm@v1
with:
java-version: '21'
java-version: '23'
distribution: 'graalvm'
github-token: ${{ secrets.GITHUB_TOKEN }}
set-java-home: true
cache: 'maven'
- name: Set up Gluon's GraalVM JDK 23
if: ${{ matrix.docker_context == 'GUI' }}
uses: gluonhq/setup-graalvm@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
arch: 'amd64'
jdk: 'java23'
- name: Package Drifty CLI with GraalVM
if: matrix.docker_context == 'CLI'
run: mvn -P build-drifty-cli-for-ubuntu-latest package
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/formatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup JDK 21
- name: Setup JDK 23
uses: actions/setup-java@v4
with:
distribution: 'oracle'
java-version: 21
java-version: 23
- name: Format Java files
run: mvn rewrite:run
- name: Install prettier
Expand Down
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.

4 changes: 2 additions & 2 deletions CLI/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<description>CLI module of Drifty</description>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.source>23</maven.compiler.source>
<maven.compiler.target>23</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cli.main-class>main.Drifty_CLI</cli.main-class>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions Core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<description>Core module of Drifty which includes the commonly used classes in Drifty CLI and GUI</description>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.source>23</maven.compiler.source>
<maven.compiler.target>23</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down
10 changes: 7 additions & 3 deletions GUI/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
<description>GUI module of Drifty</description>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.source>23</maven.compiler.source>
<maven.compiler.target>23</maven.compiler.target>
<gluonfx-maven-plugin.version>1.0.25</gluonfx-maven-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gui.main-class>main.Drifty_GUI</gui.main-class>
<system-linker-arg/>
Expand Down Expand Up @@ -48,7 +49,7 @@
<plugin>
<groupId>com.gluonhq</groupId>
<artifactId>gluonfx-maven-plugin</artifactId>
<version>1.0.23</version>
<version>${gluonfx-maven-plugin.version}</version>
<configuration>
<enableSWRendering>true</enableSWRendering>
<mainClass>${gui.main-class}</mainClass>
Expand Down Expand Up @@ -125,6 +126,9 @@
<profile>
<id>build-drifty-gui-for-windows-latest</id>
<properties>
<!-- Error: Building a native image is not yet supported on Windows with this (v1.0.25) version.
Please use GluonFX plugin version 1.0.23 instead.-->
<gluonfx-maven-plugin.version>1.0.23</gluonfx-maven-plugin.version>
<package.type>msi</package.type>
<system-linker-arg>${pom.parent.basedir}/config/missing_symbols-windows-latest.o</system-linker-arg>
<resource-config-file>resource-config-windows.json</resource-config-file>
Expand Down
Loading
Loading