Fixed another spot where memory size was being computed. (neoforged#33)

Pass heap size as megabyte, since Groovy seems to be fussy about other formats. Use integer division to prevent String.format from throwing due to invalid type conversion.
shartte · Nov 8, 2023 · f6f97f5 · f6f97f5
1 parent 44b82a3
commit f6f97f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/Execute.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/Execute.groovy
@@ -130,7 +130,7 @@ interface Execute extends WithWorkspace, WithOutput, WithJavaVersion, ExecuteSpe
                 java.getMainClass().set(mainClass)
                 java.setStandardOutput(log_out)
 
-                java.setMaxHeapSize(String.format("%dk", Runtime.getRuntime().maxMemory() / 1000))
+                java.setMaxHeapSize(String.format("%dm", Runtime.getRuntime().maxMemory().intdiv(1024 * 1024)))
             }).rethrowFailure().assertNormalExitValue()
         }
     }

diff --git a/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/RecompileSourceJar.java b/neoform/src/main/java/net/neoforged/gradle/neoform/runtime/tasks/RecompileSourceJar.java
@@ -101,7 +101,7 @@ public RecompileSourceJar() {
         getOptions().setFork(true);
         getOptions().setIncremental(true);
         getOptions().getIncrementalAfterFailure().set(true);
-        getOptions().getForkOptions().setMemoryMaximumSize(String.format("%dk", java.lang.Runtime.getRuntime().maxMemory() / 1000));
+        getOptions().getForkOptions().setMemoryMaximumSize(String.format("%dm", java.lang.Runtime.getRuntime().maxMemory() / (1024 * 1024)));
 
         //Leave this as an anon class, so that gradle is aware of this. Lambdas can not be used during task tree analysis.
         //noinspection Convert2Lambda