calabash-android 0.9.19 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f0e9088c1966c4589099c7f09f5d0a5277e48f1a65e73688e1de29368b81a0c
-  data.tar.gz: ba67584fac7e43881094e76434c7e40991a963142b87d4c4beee85c2c7681751
+  metadata.gz: d3d0ebc52f3b6f52dc1204c8d7932cbf7363df28e69772bc301bdef6b10674d9
+  data.tar.gz: 0db12e629560e593b3217b7b329ea0fb128eb4354d9ecbc4b2047aa94b909ef0
 SHA512:
-  metadata.gz: 170fa0be48bddf705ee8b45e5eb9232dc487c99c901aeedba129753d196ed62a4a0b57481f4e1c1942675dc99d9ee011a7ca860b6505c2c366c5640b4ef03bd9
-  data.tar.gz: af98a381ae39d2be77d5a5ae5a20b8a23c25bc4788b7441ffcdf40fc2753a713f2a55ff5fadbc58d7f4b27ddd916ce5777457ad886371b161d225824f1e7e818
+  metadata.gz: 20a43f3ba87da88e5adf452695d8f5f295ff4db07a87b107dcedd8d57f11411cf030e2c24de0a83ec7f7053c6b2571edfa307093849096f7cdbfdab1e04ba38b
+  data.tar.gz: c4b476e6b10f4b15286c7b43738b28ac929736a4ef8b4df87c3e2ba075dd773edf6271541b7b30b0aeedb73b72657ddd127cb3cb1f676f701e51bcd358413b06

data/bin/calabash-android-build.rb

@@ -1,6 +1,6 @@
 def calabash_build(app)
   apk_fingerprint = fingerprint_from_apk(app)
-  log "#{app} was signed with a certificate with fingerprint #{apk_fingerprint}"
+  calabash_log "#{app} was signed with a certificate with fingerprint #{apk_fingerprint}"
 
   keystores = JavaKeystore.get_keystores
   if keystores.empty?
@@ -72,7 +72,7 @@ def calabash_build(app)
     begin
 
     rescue => e
-      log e
+      calabash_log e
       raise "Could not sign test server"
     end
   end

data/bin/calabash-android-run.rb

@@ -29,7 +29,7 @@ def calabash_run(app_path = nil)
   STDOUT.sync = true
   arguments = ARGV - ["--no-build"]
   cmd = "\"#{RbConfig.ruby}\" -S cucumber #{arguments.join(" ")} #{env}"
-  log cmd
+  calabash_log cmd
   exit_code = system(cmd)
 
   sleep(1)

data/features-skeleton/support/app_installation_hooks.rb

@@ -10,9 +10,9 @@ Before do |scenario|
   feature = scenario.feature
   if FeatureMemory.feature != feature || ENV['RESET_BETWEEN_SCENARIOS'] == '1'
     if ENV['RESET_BETWEEN_SCENARIOS'] == '1'
-      log 'New scenario - reinstalling apps'
+      calabash_log 'New scenario - reinstalling apps'
     else
-      log 'First scenario in feature - reinstalling apps'
+      calabash_log 'First scenario in feature - reinstalling apps'
     end
 
     ensure_app_installed

data/lib/calabash-android/drag_helpers.rb

@@ -8,7 +8,7 @@ module Calabash
       include Calabash::Android::MonkeyHelpers
 
       def drag_coordinates(from_x, from_y, to_x, to_y, steps=10, hold_time=0.5, hang_time=0.5)
-        log "Dragging from #{from_x},#{from_y} to #{to_x},#{to_y}"
+        calabash_log "Dragging from #{from_x},#{from_y} to #{to_x},#{to_y}"
         monkey_move_from(from_x, from_y,
                          to_x, to_y,
                          hold_time: hold_time,

data/lib/calabash-android/env.rb

@@ -10,7 +10,7 @@ class Env
 
   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."
@@ -27,8 +27,8 @@ class Env
   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."
@@ -84,7 +84,7 @@ class Env
     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)
@@ -93,10 +93,10 @@ class Env
     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
@@ -131,7 +131,7 @@ class Env
 
   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
 

data/lib/calabash-android/helpers.rb

@@ -28,15 +28,15 @@ def main_activity(app)
   end
 
   begin
-    log("Trying to find launchable activity")
+    calabash_log("Trying to find launchable activity")
     launchable_activity_line = aapt_dump(app, "launchable-activity").first
     raise "'launchable-activity' not found in aapt output" unless launchable_activity_line
     m = launchable_activity_line.match(/name='([^']+)'/)
     raise "Unexpected output from aapt: #{launchable_activity_line}" unless m
-    log("Found launchable activity '#{m[1]}'")
+    calabash_log("Found launchable activity '#{m[1]}'")
     m[1]
   rescue => e
-    log("Could not find launchable activity, trying to parse raw AndroidManifest. #{e.message}")
+    calabash_log("Could not find launchable activity, trying to parse raw AndroidManifest. #{e.message}")
 
     manifest_data = `"#{Calabash::Android::Dependencies.aapt_path}" dump xmltree "#{app}" AndroidManifest.xml`
     regex = /^\s*A:[\s*]android:name\(\w+\)\=\"android.intent.category.LAUNCHER\"/
@@ -65,13 +65,13 @@ def main_activity(app)
         match = lines[index].match(/^\s*A:\s*android:targetActivity\(\w*\)\=\"([^\"]+)/){$1}
 
         if match
-          log("Found launchable activity '#{match}'")
+          calabash_log("Found launchable activity '#{match}'")
 
           return match
         end
       else
         unless lines[index].match(/\s*E: intent-filter/).nil?
-          log("Read intent filter")
+          calabash_log("Read intent filter")
           intent_filter_found = true
         end
       end
@@ -111,7 +111,7 @@ end
 
 def resign_apk(app_path)
   Dir.mktmpdir do |tmp_dir|
-    log "Resign apk"
+    calabash_log "Resign apk"
     unsigned_path = File.join(tmp_dir, 'unsigned.apk')
     unaligned_path = File.join(tmp_dir, 'unaligned.apk')
     FileUtils.cp(app_path, unsigned_path)
@@ -142,7 +142,7 @@ def unsign_apk(path)
   end
 
   if files_to_remove.empty?
-    log "App wasn't signed. Will not try to unsign it."
+    calabash_log "App wasn't signed. Will not try to unsign it."
   else
     system("\"#{Calabash::Android::Dependencies.aapt_path}\" remove \"#{path}\" #{files_to_remove.join(" ")}")
   end
@@ -150,7 +150,7 @@ end
 
 def zipalign_apk(inpath, outpath)
   cmd = %Q("#{Calabash::Android::Dependencies.zipalign_path}" -f 4 "#{inpath}" "#{outpath}")
-  log "Zipaligning using: #{cmd}"
+  calabash_log "Zipaligning using: #{cmd}"
   system(cmd)
 end
 
@@ -179,20 +179,20 @@ def fingerprint_from_apk(app_path)
 
       signature_files = Dir["#{tmp_dir}/META-INF/*"]
 
-      log 'Signature files:'
+      calabash_log 'Signature files:'
 
       signature_files.each do |signature_file|
-        log signature_file
+        calabash_log signature_file
       end
 
       raise "No signature files found in META-INF. Cannot proceed." if signature_files.empty?
       raise "More than one signature file (DSA or RSA) found in META-INF. Cannot proceed." if signature_files.length > 1
 
       cmd = "\"#{Calabash::Android::Dependencies.keytool_path}\" -v -printcert -J\"-Dfile.encoding=utf-8\" -file \"#{signature_files.first}\""
-      log cmd
+      calabash_log cmd
       fingerprints = `#{cmd}`
       md5_fingerprint = extract_sha1_fingerprint(fingerprints)
-      log "SHA1 fingerprint for signing cert (#{app_path}): #{md5_fingerprint}"
+      calabash_log "SHA1 fingerprint for signing cert (#{app_path}): #{md5_fingerprint}"
       md5_fingerprint
     end
   end
@@ -216,7 +216,7 @@ def extract_signature_algorithm_name(fingerprints)
   m.first
 end
 
-def log(message, error = false)
+def calabash_log(message, error = false)
   if error or ARGV.include? "-v" or ARGV.include? "--verbose" or ENV["DEBUG"] == "1"
     $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}"
   end

data/lib/calabash-android/java_keystore.rb

@@ -4,13 +4,13 @@ class JavaKeystore
 
   def initialize(location, keystore_alias, password, key_password = nil)
     raise "No such keystore file '#{location}'" unless File.exists?(File.expand_path(location))
-    log "Reading keystore data from keystore file '#{File.expand_path(location)}'"
+    calabash_log "Reading keystore data from keystore file '#{File.expand_path(location)}'"
 
     keystore_data = system_with_stdout_on_success(Calabash::Android::Dependencies.keytool_path, '-list', '-v', '-alias', keystore_alias, '-keystore', location, '-storepass', password, '-J"-Dfile.encoding=utf-8"', '-J"-Duser.language=en-US"')
 
     if keystore_data.nil?
       if keystore_alias.empty?
-        log "Could not obtain keystore data. Will try to extract alias automatically"
+        calabash_log "Could not obtain keystore data. Will try to extract alias automatically"
 
         keystore_data = system_with_stdout_on_success(Calabash::Android::Dependencies.keytool_path, '-list', '-v', '-keystore', location, '-storepass', password, '-J"-Dfile.encoding=utf-8"', '-J"-Duser.language=en-US"')
         aliases = keystore_data.scan(/Alias name\:\s*(.*)/).flatten
@@ -21,14 +21,14 @@ class JavaKeystore
           raise 'Multiple aliases found in keystore. Please specify alias using calabash-android setup'
         else
           keystore_alias = aliases.first
-          log "Extracted keystore alias '#{keystore_alias}'. Continuing"
+          calabash_log "Extracted keystore alias '#{keystore_alias}'. Continuing"
 
           return initialize(location, keystore_alias, password)
         end
       else
         error = "Could not list certificates in keystore. Probably because the password was incorrect."
         @errors = [{:message => error}]
-        log error
+        calabash_log error
         raise error
       end
     end
@@ -37,12 +37,12 @@ class JavaKeystore
     @keystore_alias = keystore_alias
     @password = password
     @key_password = key_password
-    log "Key store data:"
-    log keystore_data
+    calabash_log "Key store data:"
+    calabash_log keystore_data
     @fingerprint = extract_sha1_fingerprint(keystore_data)
     @signature_algorithm_name = extract_signature_algorithm_name(keystore_data)
-    log "Fingerprint: #{fingerprint}"
-    log "Signature algorithm name: #{signature_algorithm_name}"
+    calabash_log "Fingerprint: #{fingerprint}"
+    calabash_log "Signature algorithm name: #{signature_algorithm_name}"
   end
 
   def sign_apk(apk_path, dest_path)
@@ -58,8 +58,8 @@ class JavaKeystore
     signing_algorithm = "SHA1with#{encryption}"
     digest_algorithm = 'SHA1'
 
-    log "Signing using the signature algorithm: '#{signing_algorithm}'"
-    log "Signing using the digest algorithm: '#{digest_algorithm}'"
+    calabash_log "Signing using the signature algorithm: '#{signing_algorithm}'"
+    calabash_log "Signing using the digest algorithm: '#{digest_algorithm}'"
 
     cmd_args = {
       '-sigfile' => 'CERT',
@@ -88,7 +88,7 @@ class JavaKeystore
   def system_with_stdout_on_success(cmd, *args)
     a = Escape.shell_command(args)
     cmd = "\"#{cmd}\" #{a.gsub("'", '"')}"
-    log cmd
+    calabash_log cmd
     out = `#{cmd}`
     if $?.exitstatus == 0
       out
@@ -103,14 +103,14 @@ class JavaKeystore
     if File.exists? path
       keystore = JavaKeystore.new(path, 'androiddebugkey', 'android')
       if keystore.errors
-        log "Trying to "
+        calabash_log "Trying to "
         nil
       else
-        log "Unlocked keystore at #{path} - fingerprint: #{keystore.fingerprint}"
+        calabash_log "Unlocked keystore at #{path} - fingerprint: #{keystore.fingerprint}"
         keystore
       end
     else
-      log "Trying to read keystore from: #{path} - no such file"
+      calabash_log "Trying to read keystore from: #{path} - no such file"
       nil
     end
   end
@@ -136,7 +136,7 @@ class JavaKeystore
       fail_if_key_missing(keystore, "keystore_password")
       fail_if_key_missing(keystore, "keystore_alias")
       keystore["keystore_location"] = File.expand_path(keystore["keystore_location"])
-      log("Keystore location specified in #{File.exist?(".calabash_settings") ? ".calabash_settings" : "calabash_settings"}.")
+      calabash_log("Keystore location specified in #{File.exist?(".calabash_settings") ? ".calabash_settings" : "calabash_settings"}.")
       JavaKeystore.new(keystore["keystore_location"], keystore["keystore_alias"], keystore["keystore_password"], keystore['key_password'])
   end
 

data/lib/calabash-android/lib/AndroidManifest.xml

@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="#testPackage#"
-    android:versionCode="15"
-    android:versionName="0.9.15">
+    android:versionCode="21"
+    android:versionName="0.9.21">
 
     <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="28" />
 

data/lib/calabash-android/operations.rb

@@ -54,7 +54,7 @@ module Calabash module Android
       `#{default_device.adb_command} shell dumpsys window windows`.force_encoding('UTF-8').each_line.grep(/mFocusedApp.+[\.\/]([^.\s\/\}]+)/){$1}.first
     end
 
-    def log(message)
+    def calabash_log(message)
       $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose" or ENV["DEBUG"] == "1")
     end
 
@@ -158,7 +158,11 @@ module Calabash module Android
 
     def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
       path = default_device.screenshot(options)
-      embed(path, "image/png", options[:label] || File.basename(path))
+      begin
+        embed(path, "image/png", options[:label] || File.basename(path))
+      rescue NoMethodError
+        attach(path, "image/png")
+      end  
     end
 
     def screenshot(options={:prefix => nil, :name => nil})
@@ -322,8 +326,8 @@ module Calabash module Android
         @test_server_port = test_server_port
 
         forward_cmd = "#{adb_command} forward tcp:#{@server_port} tcp:#{@test_server_port}"
-        log forward_cmd
-        log `#{forward_cmd}`
+        calabash_log forward_cmd
+        calabash_log `#{forward_cmd}`
       end
 
       def _sdk_version
@@ -352,7 +356,7 @@ module Calabash module Android
           md5 = Digest::MD5.file(File.expand_path(app))
 
           if !application_installed?(package) || (!@@installed_apps.keys.include?(package) || @@installed_apps[package] != md5)
-            log "MD5 checksum for app '#{app}' (#{package}): #{md5}"
+            calabash_log "MD5 checksum for app '#{app}' (#{package}): #{md5}"
             uninstall_app(package)
             install_app(app)
             @@installed_apps[package] = md5
@@ -367,9 +371,9 @@ module Calabash module Android
           cmd = "#{adb_command} install -t \"#{app_path}\""
         end
 
-        log "Installing: #{app_path}"
+        calabash_log "Installing: #{app_path}"
         result = `#{cmd}`
-        log result
+        calabash_log result
         pn = package_name(app_path)
         succeeded = `#{adb_command} shell pm list packages`.lines.map{|line| line.chomp.sub("package:", "")}.include?(pn)
 
@@ -381,7 +385,7 @@ module Calabash module Android
         # Enable GPS location mocking on Android Marshmallow+
         if _sdk_version >= 23
           cmd = "#{adb_command} shell appops set #{package_name(app_path)} 58 allow"
-          log("Enabling GPS mocking using '#{cmd}'")
+          calabash_log("Enabling GPS mocking using '#{cmd}'")
           `#{cmd}`
         end
 
@@ -395,9 +399,9 @@ module Calabash module Android
           cmd = "#{adb_command} install -r \"#{app_path}\""
         end
 
-        log "Updating: #{app_path}"
+        calabash_log "Updating: #{app_path}"
         result = `#{cmd}`
-        log "result: #{result}"
+        calabash_log "result: #{result}"
         succeeded = result.include?("Success")
 
         unless succeeded
@@ -411,8 +415,8 @@ module Calabash module Android
         exists = application_installed?(package_name)
         
         if exists
-          log "Uninstalling: #{package_name}"
-          log `#{adb_command} uninstall #{package_name}`
+          calabash_log "Uninstalling: #{package_name}"
+          calabash_log `#{adb_command} uninstall #{package_name}`
 
           succeeded = !application_installed?(package_name)
 
@@ -421,7 +425,7 @@ module Calabash module Android
             raise "#{package_name} was not uninstalled. Aborting!"
           end
         else
-          log "Package not installed: #{package_name}. Skipping uninstall."
+          calabash_log "Package not installed: #{package_name}. Skipping uninstall."
         end
       end
 
@@ -444,7 +448,7 @@ module Calabash module Android
       end
 
       def perform_action(action, *arguments)
-        log "Action: #{action} - Params: #{arguments.join(', ')}"
+        calabash_log "Action: #{action} - Params: #{arguments.join(', ')}"
 
         params = {"command" => action, "arguments" => arguments}
 
@@ -452,10 +456,10 @@ module Calabash module Android
           begin
             result = http("/", params, {:read_timeout => 350})
           rescue => e
-            log "Error communicating with test server: #{e}"
+            calabash_log "Error communicating with test server: #{e}"
             raise e
           end
-          log "Result:'" + result.strip + "'"
+          calabash_log "Result:'" + result.strip + "'"
           raise "Empty result from TestServer" if result.chomp.empty?
           result = JSON.parse(result)
           if not result["success"] then
@@ -481,7 +485,7 @@ module Calabash module Android
             HTTPClient::KeepAliveDisconnected,
             Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED,
             Errno::ETIMEDOUT => e
-          log "It looks like your app is no longer running. \nIt could be because of a crash or because your test script shut it down."
+          calabash_log "It looks like your app is no longer running. \nIt could be because of a crash or because your test script shut it down."
           raise e
         end
       end
@@ -500,7 +504,7 @@ module Calabash module Android
             HTTPClient::KeepAliveDisconnected,
             Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED,
             Errno::ETIMEDOUT => e
-          log "It looks like your app is no longer running. \nIt could be because of a crash or because your test script shut it down."
+          calabash_log "It looks like your app is no longer running. \nIt could be because of a crash or because your test script shut it down."
           raise e
         end
       end
@@ -599,7 +603,7 @@ module Calabash module Android
           end
         else
           screenshot_cmd = "java -jar \"#{File.join(File.dirname(__FILE__), 'lib', 'screenshotTaker.jar')}\" #{serial} \"#{path}\""
-          log screenshot_cmd
+          calabash_log screenshot_cmd
           raise "Could not take screenshot" unless system(screenshot_cmd)
         end
 
@@ -616,8 +620,8 @@ module Calabash module Android
           response = perform_action('version')
           raise 'Invalid response' unless response['success']
         rescue => e
-          log("Could not contact server")
-          log(e && e.backtrace && e.backtrace.join("\n"))
+          calabash_log("Could not contact server")
+          calabash_log(e && e.backtrace && e.backtrace.join("\n"))
           raise "The server did not respond. Make sure the server is running."
         end
 
@@ -630,7 +634,7 @@ module Calabash module Android
 
       def default_serial
         devices = connected_devices
-        log "connected_devices: #{devices}"
+        calabash_log "connected_devices: #{devices}"
         raise "No connected devices" if devices.empty?
         raise "More than one device connected. Specify device serial using ADB_DEVICE_ARG" if devices.length > 1
         devices.first
@@ -652,7 +656,7 @@ module Calabash module Android
           f.write(YAML::dump(state))
           f.truncate(f.pos)
 
-          log "Persistently allocated port #{port} to #{serial}"
+          calabash_log "Persistently allocated port #{port} to #{serial}"
           return port
         end
       end
@@ -672,8 +676,8 @@ module Calabash module Android
 
       def wake_up
         wake_up_cmd = "#{adb_command} shell am start -a android.intent.action.MAIN -n #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.WakeUp"
-        log "Waking up device using:"
-        log wake_up_cmd
+        calabash_log "Waking up device using:"
+        calabash_log wake_up_cmd
         raise "Could not wake up the device" unless system(wake_up_cmd)
 
         Calabash::Android::Retry.retry :tries => 10, :interval => 1 do
@@ -740,8 +744,8 @@ module Calabash module Android
         else
           cmd = cmd_arr.join(" ")
 
-          log "Starting test server using:"
-          log cmd
+          calabash_log "Starting test server using:"
+          calabash_log cmd
           raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
         end
 
@@ -751,15 +755,15 @@ module Calabash module Android
 
         begin
           Calabash::Android::Retry.retry :tries => 300, :interval => 0.1 do
-            log "Checking if instrumentation backend is ready"
+            calabash_log "Checking if instrumentation backend is ready"
 
-            log "Is app running? #{app_running?}"
+            calabash_log "Is app running? #{app_running?}"
             ready = http("/ready", {}, {:read_timeout => 1})
             if ready != "true"
-              log "Instrumentation backend not yet ready"
+              calabash_log "Instrumentation backend not yet ready"
               raise "Not ready"
             else
-              log "Instrumentation backend is ready!"
+              calabash_log "Instrumentation backend is ready!"
             end
           end
         rescue => e
@@ -775,24 +779,24 @@ module Calabash module Android
           msg = ["Unable to obtain Test Server version. "]
           msg << "Please run 'reinstall_test_server' to make sure you have the correct version"
           msg_s = msg.join("\n")
-          log(msg_s)
+          calabash_log(msg_s)
           raise msg_s
         end
 
         client_version = client_version()
 
         if Calabash::Android::Environment.skip_version_check?
-          log(%Q[
+          calabash_log(%Q[
      Client version #{client_version}
 Test-server version #{server_version}
 
 ])
           $stdout.flush
         else
-          log "Checking client-server version match..."
+          calabash_log "Checking client-server version match..."
 
           if server_version != client_version
-             log(%Q[
+             calabash_log(%Q[
 Calabash Client and Test-server version mismatch.
 
               Client version #{client_version}
@@ -805,7 +809,7 @@ Run 'reinstall_test_server' to make sure you have the correct version
 
 ])
           else
-            log("Client and server versions match (client: #{client_version}, server: #{server_version}). Proceeding...")
+            calabash_log("Client and server versions match (client: #{client_version}, server: #{server_version}). Proceeding...")
           end
         end
 
@@ -847,11 +851,11 @@ Run 'reinstall_test_server' to make sure you have the correct version
             sleep 0.3 while app_running?
           end
         rescue HTTPClient::KeepAliveDisconnected
-          log ("Server not responding. Moving on.")
+          calabash_log ("Server not responding. Moving on.")
         rescue Timeout::Error
-          log ("Could not kill app. Waited to 3 seconds.")
+          calabash_log ("Could not kill app. Waited to 3 seconds.")
         rescue EOFError
-          log ("Could not kill app. App is most likely not running anymore.")
+          calabash_log ("Could not kill app. App is most likely not running anymore.")
         end
       end
 
@@ -871,7 +875,7 @@ Run 'reinstall_test_server' to make sure you have the correct version
 
       def get_preferences(name)
 
-        log "Get preferences: #{name}, app running? #{app_running?}"
+        calabash_log "Get preferences: #{name}, app running? #{app_running?}"
         preferences = {}
 
         if app_running?
@@ -905,7 +909,7 @@ Run 'reinstall_test_server' to make sure you have the correct version
 
       def set_preferences(name, hash)
 
-        log "Set preferences: #{name}, #{hash}, app running? #{app_running?}"
+        calabash_log "Set preferences: #{name}, #{hash}, app running? #{app_running?}"
 
         if app_running?
           perform_action('set_preferences', name, hash);
@@ -930,7 +934,7 @@ Run 'reinstall_test_server' to make sure you have the correct version
 
       def clear_preferences(name)
 
-        log "Clear preferences: #{name}, app running? #{app_running?}"
+        calabash_log "Clear preferences: #{name}, app running? #{app_running?}"
 
         if app_running?
           perform_action('clear_preferences', name);

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.9.19"
+    VERSION = "0.9.24"
 
     # A model of a software release version that can be used to compare two versions.
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.24
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement