env.rb in calabash-android-0.9.24

- old
+ new

@@ -8,11 +8,11 @@
     exit_unless_android_sdk_is_available
   end
 
   def self.exit_unless_android_sdk_is_available
     if android_home_path
-      log "Android SDK found at: #{android_home_path}"
+      calabash_log "Android SDK found at: #{android_home_path}"
       return
     end
     puts "Could not find an Android SDK please make sure it is installed."
     puts "You can read about how Calabash-Android is searching for an Android SDK and how you can help here:"
     puts "https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites"
@@ -25,12 +25,12 @@
   end
 
   def self.exit_unless_jdk_is_available
     jdk = jdk_path
     if find_executable_on_path(keytool_executable) || jdk
-      log "JDK found on PATH." if find_executable_on_path(keytool_executable)
-      log "JDK found at: #{jdk}" if jdk
+      calabash_log "JDK found on PATH." if find_executable_on_path(keytool_executable)
+      calabash_log "JDK found at: #{jdk}" if jdk
       return
     end
     puts "Could not find Java Development Kit please make sure it is installed."
     puts "You can read about how Calabash-Android is searching for a JDK and how you can help here:"
     puts "https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites"
@@ -82,23 +82,23 @@
 
   def self.zipalign_path
     zipalign_path = File.join(android_home_path, 'tools', zipalign_executable)
 
     unless File.exists?(zipalign_path)
-      log "Did not find zipalign at '#{zipalign_path}'. Trying to find zipalign in tools directories."
+      calabash_log "Did not find zipalign at '#{zipalign_path}'. Trying to find zipalign in tools directories."
 
       tools_directories.each do |dir|
         zipalign_path = File.join(dir, zipalign_executable)
         break if File.exists?(zipalign_path)
       end
     end
 
     if File.exists?(zipalign_path)
-      log "Found zipalign at '#{zipalign_path}'"
+      calabash_log "Found zipalign at '#{zipalign_path}'"
       zipalign_path
     else
-      log("Did not find zipalign in any of '#{tools_directories.join("','")}'.", true)
+      calabash_log("Did not find zipalign in any of '#{tools_directories.join("','")}'.", true)
       raise 'Could not find zipalign'
     end
   end
 
   def self.zipalign_executable
@@ -129,10 +129,10 @@
     (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
   end
 
   def self.tools_dir
     tools_dir = tools_directories.first
-    log "Found tools directory at '#{tools_dir}'"
+    calabash_log "Found tools directory at '#{tools_dir}'"
     tools_dir
   end
 
   def self.tools_directories
     Dir.chdir(android_home_path) do