From 4d856572319837d1419833b84fe1c59fd43d1d77 Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Fri, 22 Dec 2023 09:34:08 -0500
Subject: [PATCH] GP-4164: Improving guava-related build issue fix

---
 Ghidra/Framework/Generic/build.gradle | 11 ++++++++---
 Ghidra/application.properties         |  2 +-
 gradle/processorProject.gradle        |  5 +----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Ghidra/Framework/Generic/build.gradle b/Ghidra/Framework/Generic/build.gradle
index bf8753aa05..a465b3b090 100644
--- a/Ghidra/Framework/Generic/build.gradle
+++ b/Ghidra/Framework/Generic/build.gradle
@@ -41,8 +41,13 @@ dependencies {
 	api "org.bouncycastle:bcprov-jdk15on:1.69"
 	api "org.bouncycastle:bcutil-jdk15on:1.69"
 	
-
 	compileOnly "junit:junit:4.12"
+	
+	constraints {
+		api("com.google.guava:guava") {
+			attributes {
+				attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment, TargetJvmEnvironment.STANDARD_JVM))
+			}
+		}
+	}
 }
-
-
diff --git a/Ghidra/application.properties b/Ghidra/application.properties
index 10f5c1ab1b..2cef3a0a61 100644
--- a/Ghidra/application.properties
+++ b/Ghidra/application.properties
@@ -1,5 +1,5 @@
 application.name=Ghidra
-application.version=11.0.1
+application.version=11.0
 application.release.name=DEV
 application.layout.version=1
 application.gradle.min=7.3
diff --git a/gradle/processorProject.gradle b/gradle/processorProject.gradle
index ae98e02d2a..3c2ecbd012 100644
--- a/gradle/processorProject.gradle
+++ b/gradle/processorProject.gradle
@@ -30,10 +30,7 @@
  *
  *****************************************************************************************/
 configurations {
-	sleighConfig {
-		// The following line is needed so newer versions of guava can be resolved
-		attributes.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM))
-	}
+	sleighConfig
 }
 
 dependencies {