calabash-android 0.9.14 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 695cfb94529f6b67693d65dd0f2aac8bbba90beddbd82ad6450e24cfc64c13d0
-  data.tar.gz: 19aabaaa7b3dd732cbed50896c4ff97c492f80da2e881bf7343271670fabd851
+  metadata.gz: 5b68365c444de62a3d5f804dae2aa74a013237e23e108bf95f520163967fec8d
+  data.tar.gz: b4786f96f088366b0af33944908d35a2063e375920df6c56250626385944d57a
 SHA512:
-  metadata.gz: efac834ceaa7ac985335526cbbeac43790c3e3bd0d8ada97e7cc32410fdb69387a17d2df4ece52e6de4cd7d64d19417e5c7af576ea92f79afd56476ea5701d79
-  data.tar.gz: 81135440c30b237cb571f83846c2dace3a375032be0aaa2caf5bc16df49bdf9a97513219e166b0dce590acdf5740175a2730a62721aae5fe22ee937b19486f97
+  metadata.gz: cc44620f180a0cc523f18ee2439994a6d21c7a4e5df111d3a2e75da8d91344ad7a96c6d54c30f6d31d7d0a835fae6558c8134caf6d5f7e6534fe5d53848e9782
+  data.tar.gz: 3494e56bcee8fe35ed3ac3389929b82ca611ab8783048791cce03054aa3884b96ccf31fe7f9d9a2afa121b2fdd768566f6acd9224730254537381d51d2169233

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

@@ -2,10 +2,10 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="#testPackage#"
-    android:versionCode="12"
-    android:versionName="0.9.12">
+    android:versionCode="15"
+    android:versionName="0.9.15">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="28" />
+    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="28" />
 
     <application android:label="instrumentation_backend"
       android:largeHeap="true"
@@ -44,6 +44,7 @@
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData2" />
+    <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData3" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearPreferences" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.SetPreferences" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.GetPreferences" />

data/lib/calabash-android/operations.rb

@@ -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})
@@ -733,11 +737,17 @@ module Calabash module Android
 
         cmd_arr << "#{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
 
-        cmd = cmd_arr.join(" ")
+        if options[:with_uiautomator]
+          cmd_arr.insert(2, "-w")
+          shutdown_test_server
+          @adb_shell_pid = Process.spawn(cmd_arr.join(" "), :in => '/dev/null') rescue "Could not execute command to start test server with uiautomator"
+        else
+          cmd = cmd_arr.join(" ")
 
-        log "Starting test server using:"
-        log cmd
-        raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
+          log "Starting test server using:"
+          log cmd
+          raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
+        end
 
         Calabash::Android::Retry.retry :tries => 600, :interval => 0.1 do
           raise "App did not start see adb logcat for details" unless app_running?
@@ -786,7 +796,7 @@ Test-server version #{server_version}
           log "Checking client-server version match..."
 
           if server_version != client_version
-             raise(%Q[
+             log(%Q[
 Calabash Client and Test-server version mismatch.
 
               Client version #{client_version}
@@ -832,6 +842,10 @@ Run 'reinstall_test_server' to make sure you have the correct version
 
       def shutdown_test_server
         begin
+          unless @adb_shell_pid.nil?
+            Process.kill("HUP",@adb_shell_pid)
+            @adb_shell_pid = nil
+          end
           http("/kill")
           Timeout::timeout(3) do
             sleep 0.3 while app_running?

data/lib/calabash-android/version.rb

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

data/lib/calabash-android/wait_helpers.rb

@@ -61,7 +61,12 @@ module Calabash
           FileUtils.rm_f(path)
           return res
         else
-          embed(path, 'image/png', msg)
+          begin
+            embed(path, 'image/png', msg)
+          rescue NoMethodError
+            attach(path, 'image/png')
+          end
+          
           raise wait_error(msg)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.20
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -56,22 +56,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -124,16 +118,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement