Gradle prop

Makefile

@@ -31,10 +31,10 @@ endif
 
 ifdef GITHUB_ACTIONS
     # Limit Java heap size inside GitHub Actions to 6G
-    JVM_MEM = "-Xms6g -Xmx6g"
+    JVM_HEAP = "-Xms6g -Xmx6g"
 else
     # If not specified, limit Java heap size ~32G
-    JVM_MEM ?= "-Xmx32736m -Xmx32736m"
+    JVM_HEAP ?= "-Xmx32736m -Xmx32736m"
 endif
 
 
@@ -73,7 +73,7 @@ fpga-interchange-schema/interchange/capnp/java.capnp:
 # When inside GitHub Actions (which has no access to Vivado), and also when the routed netlist
 # was successfully converted back into a DCP, then return a mock PASS result
 %_$(ROUTER).check: %.netlist %_$(ROUTER).phys | compile-java
-	( ( (GRADLE_OPTS="-Xms6g -Xmx6g" ./gradlew -Dmain=com.xilinx.fpga24_routing_contest.CheckPhysNetlist :run --args='$^' $(call log_and_or_display,$@.log)) && echo "PASS" ) || echo "FAIL") > $@
+	( ( (./gradlew -Dorg.gradle.jvmargs="-Xms6g -Xmx6g" -Dmain=com.xilinx.fpga24_routing_contest.CheckPhysNetlist :run --args='$^' $(call log_and_or_display,$@.log)) && echo "PASS" ) || echo "FAIL") > $@
 	[ -z "${GITHUB_ACTION}" ] || [ ! -f "$(patsubst %.check,%.dcp,$@)" ] || echo "PASS" > $@
 
 .PHONY: score-$(ROUTER)
@@ -98,7 +98,7 @@ distclean: clean
 # Gradle is used to invoke the PartialRouterPhysNetlist class' main method with arguments
 # $< (%_unrouted.phys) and $@ (%_rwroute.phys), and log_and_or_displaying all output into %_rwroute.phys.log
 %_rwroute.phys: %_unrouted.phys | compile-java
-	(GRADLE_OPTS="$(JVM_MEM)" /usr/bin/time ./gradlew -Dmain=com.xilinx.fpga24_routing_contest.PartialRouterPhysNetlist :run --args='$< $@') $(call log_and_or_display,$@.log)
+	(/usr/bin/time ./gradlew -Dorg.gradle.jvmargs="$(JVM_HEAP)"-Dmain=com.xilinx.fpga24_routing_contest.PartialRouterPhysNetlist :run --args='$< $@') $(call log_and_or_display,$@.log)
 
 ## NXROUTE-POC
 %_nxroute-poc.phys: %_unrouted.phys xcvu3p.device | nxroute-deps fpga-interchange-schema/interchange/capnp/java.capnp