Update plumelib

benedikt-schesch · Sep 20, 2024 · 42d05d7 · 42d05d7
1 parent 5bed1e8
commit 42d05d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
+0 −30		.github/workflows/gradle-native-compile.yml
+4 −9		.github/workflows/gradle.yml
+26 −20		README.md
+16 −65		build.gradle
+ −		gradle/wrapper/gradle-wrapper.jar
+1 −1		gradle/wrapper/gradle-wrapper.properties
+2 −5		gradlew
+0 −2		gradlew.bat
+1 −1		settings.gradle
+68 −0		src/main/java/org/plumelib/merging/AbstractMergeDriver.java
+107 −0		src/main/java/org/plumelib/merging/AbstractMergeTool.java
+0 −451		src/main/java/org/plumelib/merging/AdjacentDynamicProgramming.java
+6 −19		src/main/java/org/plumelib/merging/AdjacentLinesMerger.java
+3 −17		src/main/java/org/plumelib/merging/GitLibrary.java
+6 −36		src/main/java/org/plumelib/merging/JavaAnnotationsMerger.java
+113 −0		src/main/java/org/plumelib/merging/JavaCommandLineOptions.java
+33 −63		src/main/java/org/plumelib/merging/JavaImportsMerger.java
+10 −72		src/main/java/org/plumelib/merging/JavaLibrary.java
+171 −0		src/main/java/org/plumelib/merging/JavaMergeDriver.java
+119 −0		src/main/java/org/plumelib/merging/JavaMergeTool.java
+0 −344		src/main/java/org/plumelib/merging/Main.java
+49 −24		src/main/java/org/plumelib/merging/MergeState.java
+1 −1		src/main/java/org/plumelib/merging/Merger.java
+14 −23		src/main/java/org/plumelib/merging/fileformat/ConflictedFile.java
+20 −17		src/main/java/org/plumelib/merging/fileformat/Diff3File.java
+0 −6		src/main/resources/META-INF/native-image/jni-config.json
+0 −7		src/main/resources/META-INF/native-image/predefined-classes-config.json
+0 −5		src/main/resources/META-INF/native-image/proxy-config.json
+0 −125		src/main/resources/META-INF/native-image/reflect-config.json
+0 −29		src/main/resources/META-INF/native-image/resource-config.json
+0 −41		src/main/resources/META-INF/native-image/serialization-config.json
+10 −18		src/main/sh/git-mergetool.sh
+6 −12		src/main/sh/java-merge-driver.sh
+7 −13		src/main/sh/java-merge-tool.sh
+0 −54		src/test/java/org/plumelib/merging/AdjacentDynamicProgrammingTest.java
+5 −5		src/test/java/org/plumelib/merging/JavaImportsMergerTest.java
+0 −124		src/test/resources/AdjacentTest5A.java
+0 −124		src/test/resources/AdjacentTest5B.java
+0 −123		src/test/resources/AdjacentTest5Base.java
+0 −124		src/test/resources/AdjacentTest5Goal.java
+0 −204		src/test/resources/AdjacentTest6A.java
+0 −202		src/test/resources/AdjacentTest6B.java
+0 −201		src/test/resources/AdjacentTest6Base.java
+0 −204		src/test/resources/AdjacentTest6Goal.java
+0 −94		src/test/resources/AnnotationsTest2A.java
+0 −158		src/test/resources/AnnotationsTest2B.java
+0 −94		src/test/resources/AnnotationsTest2Base.java
+0 −172		src/test/resources/AnnotationsTest2Goal.java
+0 −172		src/test/resources/AnnotationsTest2Merged.java
+0 −555		src/test/resources/ImportsTest10A.java
+0 −556		src/test/resources/ImportsTest10B.java
+0 −550		src/test/resources/ImportsTest10Base.java
+0 −561		src/test/resources/ImportsTest10Goal.java
+0 −70		src/test/resources/ImportsTest11A.java
+0 −42		src/test/resources/ImportsTest11B.java
+0 −55		src/test/resources/ImportsTest11Base.java
+0 −69		src/test/resources/ImportsTest11Goal.java
+0 −160		src/test/resources/ImportsTest12A.java
+0 −159		src/test/resources/ImportsTest12B.java
+0 −165		src/test/resources/ImportsTest12Base.java
+0 −160		src/test/resources/ImportsTest12Goal.java
+1 −1		src/test/resources/ImportsTest3Goal.java
+1 −1		src/test/resources/ImportsTest4Goal.java
+12 −14		src/test/resources/Makefile