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
This commit is contained in:
alexytomi 2025-03-30 09:26:57 +08:00 committed by GitHub
parent 98947f23d3
commit 2387817f4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 6 additions and 7 deletions

View File

@ -1 +1 @@
30ec1e2df80972e3eb89f61f9c0894f5926594ef 98947f23d338012c5869dc13de31cb39dadba333

View File

@ -1 +1 @@
d5fc862f0eba62565dee5b8e511544573c281ec1 98947f23d338012c5869dc13de31cb39dadba333

View File

@ -1 +1 @@
4903cfc8d3afd63918f59caf0a146efc2d837069 98947f23d338012c5869dc13de31cb39dadba333

View File

@ -12,7 +12,7 @@ jar {
attributes("Manifest-Version": "1.0", attributes("Manifest-Version": "1.0",
"PreMain-Class": "git.artdeell.arcdns.ArcDNSInjectorAgent") "PreMain-Class": "git.artdeell.arcdns.ArcDNSInjectorAgent")
} }
if (gitUsed){ if (gitUsed()){
File versionFile = file("../app_pojavlauncher/src/main/assets/components/arc_dns_injector/version") File versionFile = file("../app_pojavlauncher/src/main/assets/components/arc_dns_injector/version")
versionFile.write(getGitHash(project.name)) versionFile.write(getGitHash(project.name))
} }

View File

@ -15,7 +15,7 @@ jar {
from { from {
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
} }
if (gitUsed){ if (gitUsed()){
File versionFile = file("../app_pojavlauncher/src/main/assets/components/forge_installer/version") File versionFile = file("../app_pojavlauncher/src/main/assets/components/forge_installer/version")
versionFile.write(getGitHash(project.name)) versionFile.write(getGitHash(project.name))
} }

1
gl4es

@ -1 +0,0 @@
Subproject commit b9c0c79dd9ee18beffe808f53c12ad2aec6b8171

View File

@ -10,7 +10,7 @@ jar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveBaseName = "lwjgl-glfw-classes" archiveBaseName = "lwjgl-glfw-classes"
destinationDirectory.set(file("../app_pojavlauncher/src/main/assets/components/lwjgl3/")) 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") File versionFile = file("../app_pojavlauncher/src/main/assets/components/lwjgl3/version")
versionFile.write(getGitHash(project.name)) versionFile.write(getGitHash(project.name))
} }