From 46592bfe815b982b81714e59e2302e2cbb889bb2 Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Fri, 23 Jul 2021 08:25:41 -0400
Subject: [PATCH] GP-1149: Upping GhidraDev to 2.1.4

---
 .../EclipsePlugins/GhidraDev/GhidraDevFeature/feature.xml     | 2 +-
 .../GhidraDev/GhidraDevPlugin/GhidraDev_README.html           | 4 +++-
 .../GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF            | 2 +-
 .../ghidraprojectcreator/utils/GhidraProjectUtils.java        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevFeature/feature.xml b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevFeature/feature.xml
index 0994fef76f..b2944967b0 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevFeature/feature.xml
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="ghidra.ghidradev"
       label="GhidraDev"
-      version="2.1.3.qualifier"
+      version="2.1.4.qualifier"
       provider-name="Ghidra">
 
    <description>
diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
index 58807f439a..1f7ab1b5f3 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/GhidraDev_README.html
@@ -19,7 +19,7 @@
 <h1>GhidraDev README</h1>
 <p>GhidraDev provides support for developing and debugging Ghidra scripts and modules in Eclipse.
 </p>
-<p>The information provided in this document is effective as of GhidraDev 2.1.3 and is subject to
+<p>The information provided in this document is effective as of GhidraDev 2.1.4 and is subject to
 change with future releases.</p>
 
 <ul>
@@ -53,6 +53,8 @@ change with future releases.</p>
 </ul>
 
 <h2><a name="ChangeHistory"></a>Change History</h2>
+<p><u><b>2.1.4</b>:</u> Fixed exception that occurred when performing a "Link Ghidra" on projects 
+that use a Gradle classpath container.</p>
 <p><u><b>2.1.3</b>:</u> Fixed a bug that prevented Ghidra projects from recognizing extensions
 installed in the user's <i>~/.ghidra/.ghidra_&lt;version&gt;/Extensions</i> directory.</p>
 <p><u><b>2.1.2</b>:</u> Fixed exception that occurred when creating a new Ghidra scripting project 
diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF
index efb8ab1a23..3500462360 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GhidraDev
 Bundle-SymbolicName: ghidra.ghidradev;singleton:=true
-Bundle-Version: 2.1.3.qualifier
+Bundle-Version: 2.1.4.qualifier
 Bundle-Activator: ghidradev.Activator
 Require-Bundle: org.eclipse.ant.core;bundle-version="3.5.200",
  org.eclipse.buildship.core;bundle-version="3.0.0",
diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraProjectUtils.java b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraProjectUtils.java
index 3085a35f0c..a73166c137 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraProjectUtils.java
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/src/main/java/ghidradev/ghidraprojectcreator/utils/GhidraProjectUtils.java
@@ -388,7 +388,7 @@ public class GhidraProjectUtils {
 				// If the project is linked to an old Ghidra, keep the list of source folders that are
 				// linked to the Ghidra installation (after updating their paths to point to the new
 				// Ghidra installation).
-				IFolder entryFolder;
+				IFolder entryFolder = null;
 				if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
 					entryFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(entry.getPath());
 				}