diff --git a/run.sh b/run.sh index b2aba3efb8..ec7bf82c64 100755 --- a/run.sh +++ b/run.sh @@ -127,9 +127,9 @@ fi ( cd ./src/scripts/merge_tools/merging - export JAVA_HOME=$GRAALVM_HOME + export JAVA_HOME=$JAVA17_HOME export PATH="$JAVA_HOME/bin:$PATH" - ./gradlew nativeCompile + ./gradlew shadowJar ) echo "Machine ID: $machine_id" diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging index a51fc28111..b636e7c829 160000 --- a/src/scripts/merge_tools/merging +++ b/src/scripts/merge_tools/merging @@ -1 +1 @@ -Subproject commit a51fc28111b2ec20535722f2c2402402ad21362a +Subproject commit b636e7c82930df750a324c20ce8f99610cc2751b