From e14172879e6bb17cfae0b866ad31f607d11fca72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mai=20Th=C3=A0nh?= <62001770+thnhmai06@users.noreply.github.com> Date: Wed, 22 Oct 2025 17:55:39 +0700 Subject: [PATCH 1/2] [skip ci] chore: remove `/system/` ignore folder --- system/Readme.txt | 1 - system/fxgl.bundle | Bin 204 -> 0 bytes 2 files changed, 1 deletion(-) delete mode 100644 system/Readme.txt delete mode 100644 system/fxgl.bundle diff --git a/system/Readme.txt b/system/Readme.txt deleted file mode 100644 index 6578c70..0000000 --- a/system/Readme.txt +++ /dev/null @@ -1 +0,0 @@ -This directory contains FXGL system data files. \ No newline at end of file diff --git a/system/fxgl.bundle b/system/fxgl.bundle deleted file mode 100644 index a8ad53e505c87b8d3adfd6fd44deaed075b338ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmXYrJr06E6oj7$@u%`9@eVf20Vp&Us0mg!mOf#HHOns9eJJrvUcz_+Tkqfht-;|rcOFpqW4Q08b)>|CXi#oBOYxe+ME9Z6`#R;5ZLhgKa2oCw?m2??gr1+VCr zB&5GVo9(a&>QZ6O2_|hRQKkN#j8JJ%74_t}VOYbkKjZa2&)4ku?t&A-P-;v Date: Sun, 26 Oct 2025 00:03:22 +0700 Subject: [PATCH 2/2] chore!: update JDK setup to use Eclipse Temurin 24 - Changed JDK setup in build and release workflows to use Gradle's setup-java action instead of Oracle's. - Updated project configuration to reflect the new JDK vendor in various files. --- .github/workflows/build.yml | 8 ++------ .github/workflows/buildRelease.yml | 8 ++------ .github/workflows/spotless.yml | 16 ++++------------ .idea/misc.xml | 2 +- build.gradle | 1 + docs/dev/guide.md | 2 +- settings.gradle | 4 ++++ 7 files changed, 15 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41b3574..7869854 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,12 +16,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v5 - - name: Setup JDK - uses: actions/setup-java@v5 - with: - distribution: oracle - java-version: 24 - cache: gradle + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 - name: Build run: | diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml index 037d0b6..6040a56 100644 --- a/.github/workflows/buildRelease.yml +++ b/.github/workflows/buildRelease.yml @@ -16,12 +16,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v5 - - name: Setup JDK - uses: actions/setup-java@v5 - with: - distribution: oracle - java-version: 24 - cache: gradle + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 - name: Build release run: | diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml index 41ade9c..734551c 100644 --- a/.github/workflows/spotless.yml +++ b/.github/workflows/spotless.yml @@ -20,12 +20,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v5 - - name: Setup JDK - uses: actions/setup-java@v5 - with: - distribution: oracle - java-version: 24 - cache: gradle + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 - name: Run Spotless check run: | @@ -40,12 +36,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v5 - - name: Setup JDK - uses: actions/setup-java@v5 - with: - distribution: oracle - java-version: 24 - cache: gradle + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 - name: Run Spotless apply run: | diff --git a/.idea/misc.xml b/.idea/misc.xml index 3b7dc99..4901ee9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index ab6afa5..5de01a5 100644 --- a/build.gradle +++ b/build.gradle @@ -89,5 +89,6 @@ tasks.withType(JavaExec).configureEach { java { toolchain { languageVersion = JavaLanguageVersion.of(24) + vendor.set(JvmVendorSpec.ADOPTIUM) } } diff --git a/docs/dev/guide.md b/docs/dev/guide.md index 2f049a0..a08b227 100644 --- a/docs/dev/guide.md +++ b/docs/dev/guide.md @@ -2,7 +2,7 @@ ## 📋 Yêu cầu -* **[Oracle OpenJDK 24](https://openjdk.org/projects/jdk/24/)** (Language level: 24 Preview) +* **[Eclipse Temurin 24](https://adoptium.net/temurin/releases?version=24)** * **[Gradle](https://gradle.org/)** ## 🚀 Setup diff --git a/settings.gradle b/settings.gradle index d1d3ea0..27395d5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,5 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} + rootProject.name = 'Bounceverse'