From b60566b9292a0614baf9f8dea4dbcf364ec01f13 Mon Sep 17 00:00:00 2001
From: Rick Herrick <rherrick@gmail.com>
Date: Thu, 6 Oct 2016 17:16:32 -0500
Subject: [PATCH] Fix for bad version number.
---
build.gradle | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index f0906373..59c17d7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,8 +93,8 @@ repositories {
sourceCompatibility = 1.7
targetCompatibility = 1.7
-def version = Jvm.current().javaVersion
-if (version.java8Compatible || version.java9Compatible) {
+def javaVersion = Jvm.current().javaVersion
+if (javaVersion.java8Compatible || javaVersion.java9Compatible) {
if (hasProperty("rt.17.jar")) {
// Solution for bootstrap classpath warning and possible issues with compatibility with 1.7 libraries
// was taken from this post on discuss.gradle.org: http://bit.ly/24xD9j0
@@ -118,8 +118,8 @@ if (version.java8Compatible || version.java9Compatible) {
logger.warn "\n"
logger.warn "In some isolated instances, using a bootstrap library from a JDK version later than 1.7 can result in run-time errors.\n"
}
-} else if (!version.java7Compatible) {
- throw new BuildCancelledException("You are using a JDK version (${version}) that is not compatible with Java 7. The XNAT build will fail. Please install a JDK version of Java 7 or later.")
+} else if (!javaVersion.java7Compatible) {
+ throw new BuildCancelledException("You are using a JDK version (${javaVersion}) that is not compatible with Java 7. The XNAT build will fail. Please install a JDK version of Java 7 or later.")
}
if (hasProperty("archiveName")) {
--
GitLab