From 7fe2ade26f924020eb7caa34ba683ef2bc81a9ca Mon Sep 17 00:00:00 2001
From: halibobo1205 <halibobo1205@gmail.com>
Date: Mon, 2 Dec 2024 15:06:12 +0800
Subject: [PATCH] feat(arch): support x86 on jdk17

---
 .github/workflows/math-check.yml      |  1 +
 .github/workflows/x86_64-platform.yml | 13 +++++++++----
 build.gradle                          |  4 ++--
 platform/build.gradle                 |  8 ++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/math-check.yml b/.github/workflows/math-check.yml
index bd485c432a..ae48de8d9f 100644
--- a/.github/workflows/math-check.yml
+++ b/.github/workflows/math-check.yml
@@ -17,6 +17,7 @@ jobs:
       - name: Check for java.lang.Math usage
         id: check-math
         shell: bash
+        continue-on-error: true
         run: |
           echo "Checking for java.lang.Math usage..."
           
diff --git a/.github/workflows/x86_64-platform.yml b/.github/workflows/x86_64-platform.yml
index d4d51a10a2..257edb0ebf 100644
--- a/.github/workflows/x86_64-platform.yml
+++ b/.github/workflows/x86_64-platform.yml
@@ -15,9 +15,9 @@ on:
 
 jobs:
   build:
-
-    name: ${{ matrix.os }} - ${{ matrix.os-version }}
+    name: ${{ matrix.os }} - ${{ matrix.os-version }} - JDK ${{ matrix.java-version }}
     runs-on: ${{ matrix.runner }}
+    timeout-minutes: 60
     
     strategy:
       fail-fast: false
@@ -28,29 +28,34 @@ jobs:
             arch: x86_64
             runner: macos-12
             os-version: "12"
+            java-version: '8'
           - os: macOS
             arch: x86_64
             runner: macos-13
             os-version: "13"
+            java-version: '17'
           # Linux x86_64 runners
           - os: Linux
             arch: x86_64
             runner: ubuntu-20.04
             os-version: "20.04"
+            java-version: '8'
           - os: Linux
             arch: x86_64
             runner: ubuntu-22.04
             os-version: "22.04"
+            java-version: '17'
 
     permissions:
       contents: read
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 8
+
+    - name: Set up JDK ${{ matrix.java-version }}
       uses: actions/setup-java@v4
       with:
-        java-version: '8'
+        java-version: ${{ matrix.java-version }}
         distribution: 'zulu'
 
     # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
diff --git a/build.gradle b/build.gradle
index 3ec30cf4d4..89bc5ff17b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,8 +19,8 @@ if (isArm64() && !JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)
             "  Detected version ${JavaVersion.current()}")
 }
 
-if (isX86() && !JavaVersion.current().isJava8()) {
-    throw new GradleException("Java 8 is required to build Java-Tron for x86.\n" +
+if (isX86() && !JavaVersion.current().isJava8Compatible()) {
+    throw new GradleException("Java 8 or later is required to build Java-Tron for x86.\n" +
             "  Detected version ${JavaVersion.current()}")
 }
 
diff --git a/platform/build.gradle b/platform/build.gradle
index d692bbc381..bc1ab18536 100644
--- a/platform/build.gradle
+++ b/platform/build.gradle
@@ -8,7 +8,11 @@ static def isX86() {
     return Architectures.X86_64.isAlias(arch) || Architectures.X86.isAlias(arch)
 }
 
-if (isX86()) {
+static def isJava8() {
+    return JavaVersion.current().isJava8()
+}
+
+if (isX86() && isJava8()) {
     ext {
         leveldbGroup = "org.fusesource.leveldbjni"
         leveldbName = "leveldbjni-all"
@@ -43,5 +47,5 @@ dependencies {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    source = isX86() ? sourceSets.x86.java : sourceSets.arm.java
+    source = isX86() && isJava8() ? sourceSets.x86.java : sourceSets.arm.java
 }