Fix last PR's issues with building (#6773)

alexytomi · web-flow · commit 2387817f4f38 · 2025-03-29T19:26:57.000-06:00
* fix(submodules): Remove broken, unused gl4es submodule

* fix(build): Git checks had typo

version also gets updated here because I changed their build.gradle
diff --git 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
+98947f23d338012c5869dc13de31cb39dadba333
diff --git a/app_pojavlauncher/src/main/assets/components/forge_installer/version b/app_pojavlauncher/src/main/assets/components/forge_installer/version
@@ -1 +1 @@
-d5fc862f0eba62565dee5b8e511544573c281ec1
+98947f23d338012c5869dc13de31cb39dadba333
diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/version
@@ -1 +1 @@
-4903cfc8d3afd63918f59caf0a146efc2d837069
+98947f23d338012c5869dc13de31cb39dadba333
diff --git 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
@@ -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
diff --git 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))
     }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-30ec1e2df80972e3eb89f61f9c0894f5926594ef`
	`1`	`+98947f23d338012c5869dc13de31cb39dadba333`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-d5fc862f0eba62565dee5b8e511544573c281ec1`
	`1`	`+98947f23d338012c5869dc13de31cb39dadba333`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4903cfc8d3afd63918f59caf0a146efc2d837069`
	`1`	`+98947f23d338012c5869dc13de31cb39dadba333`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ jar {`
`12`	`12`	`attributes("Manifest-Version": "1.0",`
`13`	`13`	`"PreMain-Class": "git.artdeell.arcdns.ArcDNSInjectorAgent")`
`14`	`14`	`}`
`15`		`- if (gitUsed){`
	`15`	`+ if (gitUsed()){`
`16`	`16`	`File versionFile = file("../app_pojavlauncher/src/main/assets/components/arc_dns_injector/version")`
`17`	`17`	`versionFile.write(getGitHash(project.name))`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ jar {`
`15`	`15`	`from {`
`16`	`16`	`configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }`
`17`	`17`	`}`
`18`		`- if (gitUsed){`
	`18`	`+ if (gitUsed()){`
`19`	`19`	`File versionFile = file("../app_pojavlauncher/src/main/assets/components/forge_installer/version")`
`20`	`20`	`versionFile.write(getGitHash(project.name))`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ jar {`
`10`	`10`	`duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`11`	`11`	`archiveBaseName = "lwjgl-glfw-classes"`
`12`	`12`	`destinationDirectory.set(file("../app_pojavlauncher/src/main/assets/components/lwjgl3/"))`
`13`		`- if (gitUsed){`
	`13`	`+ if (gitUsed()){`
`14`	`14`	`File versionFile = file("../app_pojavlauncher/src/main/assets/components/lwjgl3/version")`
`15`	`15`	`versionFile.write(getGitHash(project.name))`
`16`	`16`	`}`