Create method for getting JDK path based on system

fzymek · Feb 28, 2016 · 2ac719c · 2ac719c
1 parent 36f22b2
commit 2ac719c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -61,5 +61,13 @@ dependencies {
 }
 
 retrolambda {
-    jdk getProperty("JAVA_HOME")
+    jdk getJDKPath()
 }
+
+def getJDKPath() {
+    if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
+        return getProperty("JAVA_HOME")
+    } else {
+        return System.getenv("JAVA_HOME")
+    }
+}
diff --git a/app/libs/library.aar b/app/libs/library.aar
diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+#used on mac os to define JDK path for retrolambda
 JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_74.jdk/Contents/Home