Merge branch 'master' into rootcubed

Cuyler36 · Jun 8, 2024 · d0d165e · d0d165e
2 parents d4ed731 + d29f7e2
commit d0d165e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,11 +18,11 @@ jobs:
         unzip ghidra.zip -d ~/ghidra
         rm ghidra.zip
       env:
-        GHIDRA_URL: https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.0_build/ghidra_11.0_PUBLIC_20231222.zip
+        GHIDRA_URL: https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.1_build/ghidra_11.1_PUBLIC_20240607.zip
     - name: Execute Gradle build
       run: ./gradlew
       env:
-        GHIDRA_INSTALL_DIR: /home/runner/ghidra/ghidra_11.0_PUBLIC/
+        GHIDRA_INSTALL_DIR: /home/runner/ghidra/ghidra_11.1_PUBLIC/
     - name: Release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')

diff --git a/src/main/java/gamecubeloader/common/CodeWarriorDemangler.java b/src/main/java/gamecubeloader/common/CodeWarriorDemangler.java
@@ -1,17 +1,8 @@
 package gamecubeloader.common;
 
 import java.util.ArrayList;
-import ghidra.app.util.demangler.DemangledDataType;
-import ghidra.app.util.demangler.DemangledException;
-import ghidra.app.util.demangler.DemangledFunction;
-import ghidra.app.util.demangler.DemangledFunctionPointer;
-import ghidra.app.util.demangler.DemangledObject;
-import ghidra.app.util.demangler.DemangledTemplate;
-import ghidra.app.util.demangler.DemangledType;
-import ghidra.app.util.demangler.DemangledVariable;
-import ghidra.app.util.demangler.Demangler;
-import ghidra.app.util.demangler.DemanglerOptions;
-import ghidra.app.util.demangler.DemangledParameter;
+
+import ghidra.app.util.demangler.*;
 import ghidra.program.model.listing.Program;
 import ghidra.util.map.TypeMismatchException;