Fix build options and gradle update

mgoellnitz · Feb 23, 2019 · 6df2124 · 6df2124
1 parent e3a23a1
commit 6df2124
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,12 +15,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 # Environment variables needed:
-# ORG_GRADLE_PROJECT_bintrayUser
-# ORG_GRADLE_PROJECT_bintrayKey
-# VERSIONEYE_API_KEY
-# TANGRAM_MORPHIA_INTEGRATION_TEST
-# JAVA_OPTS="-XX:PermSize=128m -XX:MaxPermSize=256m" (for Java 7)
-# ORG_GRADLE_PROJECT_release=true
+# ORG_GRADLE_PROJECT_bintrayUser (optional)
+# ORG_GRADLE_PROJECT_bintrayKey (optional)
+# TANGRAM_MORPHIA_INTEGRATION_TEST (for successful integration test points to a MongoDB)
+# ORG_GRADLE_PROJECT_release=true (optional)
 #
 sudo: false
 

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -45,7 +45,7 @@ targetCompatibility = 1.8
 
 def bootstrapClasspathStr = "${project.hasProperty('jdk') ? jdk : System.env.JAVA_HOME}/jre/lib/rt.jar"
 project.tasks.withType(AbstractCompile, { AbstractCompile ac ->
-    ac.options.bootstrapClasspath = bootstrapClasspathStr
+    ac.options.bootstrapClasspath = files(bootstrapClasspathStr)
 })
 
 String[] roots = ["${project.projectDir}/src/main/groovy"]

diff --git a/commons.gradle b/commons.gradle
@@ -50,7 +50,7 @@ if (project.hasProperty('jdk')) {
   def bootstrapClasspathStr = "${jdk}/jre/lib/rt.jar"
   println "Defining boot class path $bootstrapClasspathStr"
   project.tasks.withType(AbstractCompile, { AbstractCompile ac ->
-      ac.options.bootstrapClasspath = bootstrapClasspathStr
+      ac.options.bootstrapClasspath = files(bootstrapClasspathStr)
     })
 }