From 2387817f4f38c88b00238f028871b1e09c90e90d Mon Sep 17 00:00:00 2001 From: alexytomi <60690056+alexytomi@users.noreply.github.com> Date: Sun, 30 Mar 2025 09:26:57 +0800 Subject: [PATCH] Fix last PR's issues with building (#6773) * fix(submodules): Remove broken, unused gl4es submodule * fix(build): Git checks had typo version also gets updated here because I changed their build.gradle --- .../src/main/assets/components/arc_dns_injector/version | 2 +- .../src/main/assets/components/forge_installer/version | 2 +- app_pojavlauncher/src/main/assets/components/lwjgl3/version | 2 +- arc_dns_injector/build.gradle | 2 +- forge_installer/build.gradle | 2 +- gl4es | 1 - jre_lwjgl3glfw/build.gradle | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) delete mode 160000 gl4es diff --git a/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version b/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version index 8e2803cf7..66dd97613 100644 --- a/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version +++ b/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version @@ -1 +1 @@ -30ec1e2df80972e3eb89f61f9c0894f5926594ef \ No newline at end of file +98947f23d338012c5869dc13de31cb39dadba333 \ No newline at end of file diff --git a/app_pojavlauncher/src/main/assets/components/forge_installer/version b/app_pojavlauncher/src/main/assets/components/forge_installer/version index bfff5b5e1..66dd97613 100644 --- a/app_pojavlauncher/src/main/assets/components/forge_installer/version +++ b/app_pojavlauncher/src/main/assets/components/forge_installer/version @@ -1 +1 @@ -d5fc862f0eba62565dee5b8e511544573c281ec1 \ No newline at end of file +98947f23d338012c5869dc13de31cb39dadba333 \ No newline at end of file diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/version index 62dc39e8e..66dd97613 100644 --- a/app_pojavlauncher/src/main/assets/components/lwjgl3/version +++ b/app_pojavlauncher/src/main/assets/components/lwjgl3/version @@ -1 +1 @@ -4903cfc8d3afd63918f59caf0a146efc2d837069 \ No newline at end of file +98947f23d338012c5869dc13de31cb39dadba333 \ No newline at end of file diff --git a/arc_dns_injector/build.gradle b/arc_dns_injector/build.gradle index ddd30f0cc..53c730b2c 100644 --- a/arc_dns_injector/build.gradle +++ b/arc_dns_injector/build.gradle @@ -12,7 +12,7 @@ jar { attributes("Manifest-Version": "1.0", "PreMain-Class": "git.artdeell.arcdns.ArcDNSInjectorAgent") } - if (gitUsed){ + if (gitUsed()){ File versionFile = file("../app_pojavlauncher/src/main/assets/components/arc_dns_injector/version") versionFile.write(getGitHash(project.name)) } diff --git a/forge_installer/build.gradle b/forge_installer/build.gradle index 67f044cdc..82d1ec18f 100644 --- a/forge_installer/build.gradle +++ b/forge_installer/build.gradle @@ -15,7 +15,7 @@ jar { from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } - if (gitUsed){ + if (gitUsed()){ File versionFile = file("../app_pojavlauncher/src/main/assets/components/forge_installer/version") versionFile.write(getGitHash(project.name)) } diff --git a/gl4es b/gl4es deleted file mode 160000 index b9c0c79dd..000000000 --- a/gl4es +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b9c0c79dd9ee18beffe808f53c12ad2aec6b8171 diff --git a/jre_lwjgl3glfw/build.gradle b/jre_lwjgl3glfw/build.gradle index 1e4dec17b..cb3003a00 100644 --- a/jre_lwjgl3glfw/build.gradle +++ b/jre_lwjgl3glfw/build.gradle @@ -10,7 +10,7 @@ jar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE archiveBaseName = "lwjgl-glfw-classes" destinationDirectory.set(file("../app_pojavlauncher/src/main/assets/components/lwjgl3/")) - if (gitUsed){ + if (gitUsed()){ File versionFile = file("../app_pojavlauncher/src/main/assets/components/lwjgl3/version") versionFile.write(getGitHash(project.name)) }