From 8f591f99bdc6b0a3c5d66f7accabefdfff604c27 Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@126.com>
Date: Wed, 8 Sep 2021 09:38:45 +0800
Subject: [PATCH] reorder dependencies

---
 .../assets/openjfx-dependencies.json          | 30 +++++++++----------
 build.gradle                                  |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/HMCL/src/main/resources/assets/openjfx-dependencies.json b/HMCL/src/main/resources/assets/openjfx-dependencies.json
index 6ff271d09..a7ea1232a 100644
--- a/HMCL/src/main/resources/assets/openjfx-dependencies.json
+++ b/HMCL/src/main/resources/assets/openjfx-dependencies.json
@@ -14,6 +14,21 @@
       "win-x86": "d35c89f5cb5f9dd8c54c69b4a153a94377e60931"
     }
   },
+  {
+    "module": "javafx.graphics",
+    "groupId": "org.openjfx",
+    "artifactId": "javafx-graphics",
+    "version": "17",
+    "sha1": {
+      "linux": "88dc59568c14ec37ea1c42b3ba472d78b4b1030a",
+      "linux-arm32-monocle": "44284bba939b1249fcc3f5502a70bd48e88e1fa9",
+      "linux-aarch64": "40bd7094b8f43d4637a8a274b4b199835d6cfd5c",
+      "mac": "8b1d1124ce83e874db390016913fba7708f3592d",
+      "mac-aarch64": "b6326f61f7e0effbf733d62e83b8317eb8e768b4",
+      "win": "2c56d252b97eba8b42f049c6ce145172d744ce08",
+      "win-x86": "c4d74a11a7ffb182fb43803756e678c87876a0a4"
+    }
+  },
   {
     "module": "javafx.controls",
     "groupId": "org.openjfx",
@@ -44,21 +59,6 @@
       "win-x86": "3bde4e98cee0a464f327b9e983aded3017fddbc0"
     }
   },
-  {
-    "module": "javafx.graphics",
-    "groupId": "org.openjfx",
-    "artifactId": "javafx-graphics",
-    "version": "17",
-    "sha1": {
-      "linux": "88dc59568c14ec37ea1c42b3ba472d78b4b1030a",
-      "linux-arm32-monocle": "44284bba939b1249fcc3f5502a70bd48e88e1fa9",
-      "linux-aarch64": "40bd7094b8f43d4637a8a274b4b199835d6cfd5c",
-      "mac": "8b1d1124ce83e874db390016913fba7708f3592d",
-      "mac-aarch64": "b6326f61f7e0effbf733d62e83b8317eb8e768b4",
-      "win": "2c56d252b97eba8b42f049c6ce145172d744ce08",
-      "win-x86": "c4d74a11a7ffb182fb43803756e678c87876a0a4"
-    }
-  },
   {
     "module": "javafx.media",
     "groupId": "org.openjfx",
diff --git a/build.gradle b/build.gradle
index bfef6ee62..259e864b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,7 +79,7 @@ task 'generateOpenJFXDependencies' {
                 }
                 sha1.addProperty(
                         arch,
-                        new URL("${jfxRepos[0]}/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-${arch}.jar.sha1").getText("UTF-8")
+                        new URL("${jfxRepos.head()}/org/openjfx/javafx-$module/$jfxVersion/javafx-$module-$jfxVersion-${arch}.jar.sha1").getText("UTF-8")
                 )
             }
             m.add("sha1", sha1)
@@ -94,7 +94,7 @@ task 'generateOpenJFXDependencies' {
 // Ensure that the mirror repository caches files
 task 'preTouchOpenJFXDependencies' {
     doLast {
-        jfxRepos.forEach { repo ->
+        jfxRepos.tail().forEach { repo ->
             jfxModules.forEach { module ->
                 jfxArches.forEach { arch ->
                     if (module == 'web' && arch.endsWith('linux-arm32-monocle')) {