From 413949b64aa6faff80f2395d3f473870d6f9150f Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Wed, 9 Jul 2025 14:50:25 -0400 Subject: [PATCH] GP-0: Bumping master to 12.0 --- .../service/tracermi/TraceRmiHandler.java | 2 +- .../src/main/py/src/ghidratrace/client.py | 2 +- .../breakpoint/TraceBreakpointLocation.java | 2 +- .../java/ghidra/app/script/GhidraScript.java | 6 ++-- .../app/services/DataTypeQueryService.java | 2 +- .../java/ghidra/app/util/XReferenceUtils.java | 2 +- .../app/util/importer/AutoImporter.java | 30 +++++++++---------- .../importer/LoaderArgsOptionChooser.java | 4 +-- .../app/util/importer/OptionChooser.java | 6 ++-- .../app/util/importer/ProgramLoader.java | 2 +- .../app/util/importer/SingleLoaderFilter.java | 4 +-- .../ghidra/app/util/opinion/LoadResults.java | 8 ++--- .../java/ghidra/app/util/opinion/Loaded.java | 4 +-- .../ghidra/base/project/GhidraProject.java | 12 ++++---- Ghidra/application.properties | 2 +- GhidraDocs/GettingStarted.md | 2 +- 16 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java index 4d32deabaf..63361deeeb 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java +++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java @@ -73,7 +73,7 @@ public class TraceRmiHandler extends AbstractTraceRmiConnection { * NOTE: This can't just be Application.getApplicationVersion(), because the Python client only * specifies up to the minor, not patch, release. */ - public static final String VERSION = "11.5"; + public static final String VERSION = "12.0"; protected static class VersionMismatchError extends TraceRmiError { public VersionMismatchError(String remote) { diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py b/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py index 23a3b25165..b1ce3bd983 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py +++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py @@ -48,7 +48,7 @@ from .util import send_delimited, recv_delimited # Other places to change: # * every pyproject.toml file (incl. deps) # * TraceRmiHandler.VERSION -VERSION = '11.5' +VERSION = '12.0' E = TypeVar('E') diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/breakpoint/TraceBreakpointLocation.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/breakpoint/TraceBreakpointLocation.java index 50f6722be9..d3d3a071e2 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/breakpoint/TraceBreakpointLocation.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/breakpoint/TraceBreakpointLocation.java @@ -67,7 +67,7 @@ public interface TraceBreakpointLocation extends TraceBreakpointCommon { * @param snap the snap * @return the (possibly empty) set of affected threads */ - @Deprecated(forRemoval = true, since = "11.5") + @Deprecated(forRemoval = true, since = "12.0") Set getThreads(long snap); /** diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java index de319f45e2..987ba38f99 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScript.java @@ -204,7 +204,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * @deprecated Use {@link #set(GhidraState)} or {@link #set(GhidraState, ScriptControls)} * instead */ - @Deprecated(since = "11.5") + @Deprecated(since = "12.0") public final void set(GhidraState state, TaskMonitor monitor, PrintWriter writer) { set(state, new ScriptControls(writer, writer, monitor)); } @@ -267,7 +267,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * @deprecated Use {@link #execute(GhidraState, ScriptControls)} instead to also set a * {@link PrintWriter} for {@code stderr} */ - @Deprecated(since = "11.5") + @Deprecated(since = "12.0") public final void execute(GhidraState runState, TaskMonitor runMonitor, PrintWriter runWriter) throws Exception { execute(runState, new ScriptControls(runWriter, runWriter, runMonitor)); @@ -1003,7 +1003,7 @@ public abstract class GhidraScript extends FlatProgramAPI { * @return a demangled version of the mangled string, or null if it could not be demangled * @deprecated Use {@link DemanglerUtil#demangle(Program, String, Address)} instead */ - @Deprecated(since = "11.5") + @Deprecated(since = "12.0") public String getDemangled(String mangled) { List demangledObjs = DemanglerUtil.demangle(currentProgram, mangled, null); if (!demangledObjs.isEmpty()) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/services/DataTypeQueryService.java b/Ghidra/Features/Base/src/main/java/ghidra/app/services/DataTypeQueryService.java index 1ba4bb3624..3a8f294c40 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/services/DataTypeQueryService.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/services/DataTypeQueryService.java @@ -57,7 +57,7 @@ public interface DataTypeQueryService { * @deprecated use {@link #promptForDataType(String)} */ @SuppressWarnings("javadoc") - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public DataType getDataType(String filterText); /** diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/XReferenceUtils.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/XReferenceUtils.java index 14874e3aa2..cc3af7245a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/XReferenceUtils.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/XReferenceUtils.java @@ -227,7 +227,7 @@ public class XReferenceUtils { * ProgramLocation, Supplier)}. That method takes a supplier that can regenerate the current * xrefs for the table. */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static void showXrefs(Navigatable navigatable, ServiceProvider serviceProvider, TableService service, ProgramLocation location, Collection xrefs) { diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/AutoImporter.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/AutoImporter.java index 7da9ac1d58..fb47acaf45 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/AutoImporter.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/AutoImporter.java @@ -37,7 +37,7 @@ import ghidra.util.task.TaskMonitor; * * @deprecated Use {@link ProgramLoader} */ -@Deprecated(since = "11.5", forRemoval = true) +@Deprecated(since = "12.0", forRemoval = true) public final class AutoImporter { private AutoImporter() { // service class; cannot instantiate @@ -79,7 +79,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByUsingBestGuess(File file, Project project, String projectFolderPath, Object consumer, MessageLog messageLog, TaskMonitor monitor) throws IOException, CancelledException, DuplicateNameException, InvalidNameException, @@ -129,7 +129,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByUsingBestGuess(FSRL fsrl, Project project, String projectFolderPath, Object consumer, MessageLog messageLog, TaskMonitor monitor) throws IOException, CancelledException, DuplicateNameException, InvalidNameException, @@ -179,7 +179,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByUsingBestGuess(ByteProvider provider, Project project, String projectFolderPath, Object consumer, MessageLog messageLog, TaskMonitor monitor) throws IOException, CancelledException, DuplicateNameException, @@ -230,7 +230,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByUsingSpecificLoaderClass(File file, Project project, String projectFolderPath, Class loaderClass, List> loaderArgs, Object consumer, MessageLog messageLog, @@ -284,7 +284,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByUsingSpecificLoaderClass(FSRL fsrl, Project project, String projectFolderPath, Class loaderClass, List> loaderArgs, Object consumer, MessageLog messageLog, @@ -339,7 +339,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByLookingForLcs(File file, Project project, String projectFolderPath, Language language, CompilerSpec compilerSpec, Object consumer, MessageLog messageLog, TaskMonitor monitor) throws IOException, CancelledException, @@ -393,7 +393,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByLookingForLcs(FSRL fsrl, Project project, String projectFolderPath, Language language, CompilerSpec compilerSpec, Object consumer, MessageLog messageLog, TaskMonitor monitor) throws IOException, CancelledException, @@ -448,7 +448,7 @@ public final class AutoImporter { * failed language upgrade * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByUsingSpecificLoaderClassAndLcs(File file, Project project, String projectFolderPath, Class loaderClass, List> loaderArgs, Language language, CompilerSpec compilerSpec, @@ -506,7 +506,7 @@ public final class AutoImporter { * failed language upgrade * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importByUsingSpecificLoaderClassAndLcs(FSRL fsrl, Project project, String projectFolderPath, Class loaderClass, List> loaderArgs, Language language, CompilerSpec compilerSpec, @@ -562,7 +562,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static Loaded importAsBinary(File file, Project project, String projectFolderPath, Language language, CompilerSpec compilerSpec, Object consumer, MessageLog messageLog, TaskMonitor monitor) throws IOException, CancelledException, @@ -618,7 +618,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static Loaded importAsBinary(ByteProvider bytes, Project project, String projectFolderPath, Language language, CompilerSpec compilerSpec, Object consumer, MessageLog messageLog, TaskMonitor monitor) throws IOException, @@ -680,7 +680,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importFresh(File file, Project project, String projectFolderPath, Object consumer, MessageLog messageLog, TaskMonitor monitor, Predicate loaderFilter, LoadSpecChooser loadSpecChooser, @@ -743,7 +743,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importFresh(FSRL fsrl, Project project, String projectFolderPath, Object consumer, MessageLog messageLog, TaskMonitor monitor, Predicate loaderFilter, LoadSpecChooser loadSpecChooser, @@ -806,7 +806,7 @@ public final class AutoImporter { * @throws LoadException if nothing was loaded * @deprecated Use {@link ProgramLoader} */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public static LoadResults importFresh(ByteProvider provider, Project project, String projectFolderPath, Object consumer, MessageLog messageLog, TaskMonitor monitor, Predicate loaderFilter, LoadSpecChooser loadSpecChooser, diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LoaderArgsOptionChooser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LoaderArgsOptionChooser.java index db3bcc6330..7bef10ab2f 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LoaderArgsOptionChooser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/LoaderArgsOptionChooser.java @@ -28,7 +28,7 @@ import ghidra.util.Msg; * * @deprecated Use {@link ProgramLoader.Builder#loaderArgs(List)} instead */ -@Deprecated(since = "11.5", forRemoval = true) +@Deprecated(since = "12.0", forRemoval = true) public class LoaderArgsOptionChooser implements OptionChooser { private List> loaderArgs; @@ -39,7 +39,7 @@ public class LoaderArgsOptionChooser implements OptionChooser { * @param loaderArgs The {@link Loader} arguments * @deprecated Use {@link ProgramLoader.Builder#loaderArgs(List)} instead */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) public LoaderArgsOptionChooser(List> loaderArgs) { this.loaderArgs = loaderArgs; } diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/OptionChooser.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/OptionChooser.java index 49947adf74..e2de867069 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/OptionChooser.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/importer/OptionChooser.java @@ -27,7 +27,7 @@ import ghidra.program.model.address.AddressFactory; * * @deprecated Use {@link ProgramLoader.Builder#loaderArgs(List)} instead */ -@Deprecated(since = "11.5", forRemoval = true) +@Deprecated(since = "12.0", forRemoval = true) @FunctionalInterface public interface OptionChooser { public static final OptionChooser DEFAULT_OPTIONS = (choices, addressFactory) -> choices; @@ -40,7 +40,7 @@ public interface OptionChooser { * @return The {@link List} of {@link Loader} options to use * @deprecated Use {@link ProgramLoader.Builder#loaderArgs(List)} instead */ - @Deprecated(since = "11.5", forRemoval = true) + @Deprecated(since = "12.0", forRemoval = true) List