From 269ea1ae7aaabd2c9eacef55572f9cf55c0a755f Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Thu, 27 Apr 2023 07:50:33 -0400
Subject: [PATCH] GP-0: Fixing some project java version inconsistencies

---
 GhidraBuild/BuildFiles/JsonDoclet/build.gradle                 | 3 +++
 .../EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle      | 3 +++
 GhidraDocs/build.gradle                                        | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/GhidraBuild/BuildFiles/JsonDoclet/build.gradle b/GhidraBuild/BuildFiles/JsonDoclet/build.gradle
index 3349354b6d..757635c9c7 100644
--- a/GhidraBuild/BuildFiles/JsonDoclet/build.gradle
+++ b/GhidraBuild/BuildFiles/JsonDoclet/build.gradle
@@ -18,6 +18,9 @@ eclipse.project.name = '_JsonDoclet'
 
 apply plugin: 'java-library'
 
+sourceCompatibility = "${rootProject.JAVA_COMPILER}"
+targetCompatibility = "${rootProject.JAVA_COMPILER}"
+
 dependencies {
 	api "com.google.code.gson:gson:2.9.0"
 }
diff --git a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle
index b7a0a6811b..fb0be7b292 100644
--- a/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle
+++ b/GhidraBuild/EclipsePlugins/GhidraDev/GhidraDevPlugin/build.gradle
@@ -15,6 +15,9 @@
  */
 apply plugin: 'java-library'
 
+sourceCompatibility = "${rootProject.JAVA_COMPILER}"
+targetCompatibility = "${rootProject.JAVA_COMPILER}"
+
 //This project requires the eclpse PDE plugin. To create eclipse files for this project, run 
 //	"gradle eclipse -PeclipsePDE" 
 if (hasProperty("eclipsePDE")) {
diff --git a/GhidraDocs/build.gradle b/GhidraDocs/build.gradle
index d484ae3b57..0c5685db7d 100644
--- a/GhidraDocs/build.gradle
+++ b/GhidraDocs/build.gradle
@@ -17,6 +17,9 @@ apply plugin: 'java-library'
 apply plugin: 'eclipse'
 eclipse.project.name = '_GhidraDocs'
 
+sourceCompatibility = "${rootProject.JAVA_COMPILER}"
+targetCompatibility = "${rootProject.JAVA_COMPILER}"
+
 sourceSets {
 	ghidraClass {
 		java {