lib/calabash-android/env.rb in calabash-android-0.5.5 vs lib/calabash-android/env.rb in calabash-android-0.5.6.pre1
- old
+ new
@@ -48,10 +48,11 @@
end
def self.jdk_path
path_if_jdk(ENV['JAVA_HOME']) ||
if is_windows?
+ path_if_jdk(read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, 'SOFTWARE\\JavaSoft\\Java Development Kit\\1.8', 'JavaHome')) ||
path_if_jdk(read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, 'SOFTWARE\\JavaSoft\\Java Development Kit\\1.7', 'JavaHome')) ||
path_if_jdk(read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, 'SOFTWARE\\JavaSoft\\Java Development Kit\\1.6', 'JavaHome'))
else
path_if_jdk(read_attribute_from_monodroid_config('java-sdk', 'path'))
end
@@ -180,6 +181,7 @@
rescue
nil
end
end
-end
\ No newline at end of file
+end
+