calabash-android 0.9.14 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 695cfb94529f6b67693d65dd0f2aac8bbba90beddbd82ad6450e24cfc64c13d0
-  data.tar.gz: 19aabaaa7b3dd732cbed50896c4ff97c492f80da2e881bf7343271670fabd851
+  metadata.gz: 5c9d04b019926835a04fbc8b2a6ceb564330f3edf856714f6c29eea0503c5a51
+  data.tar.gz: 438bc3d451e570d80acaeb5120f38b3bf4037c1812fc6125ce4a710a836ad85f
 SHA512:
-  metadata.gz: efac834ceaa7ac985335526cbbeac43790c3e3bd0d8ada97e7cc32410fdb69387a17d2df4ece52e6de4cd7d64d19417e5c7af576ea92f79afd56476ea5701d79
-  data.tar.gz: 81135440c30b237cb571f83846c2dace3a375032be0aaa2caf5bc16df49bdf9a97513219e166b0dce590acdf5740175a2730a62721aae5fe22ee937b19486f97
+  metadata.gz: 2efd50e4d2b63e59f0e5c6efca391deebbff7c528b702570f871add5735ea7d61a72f793788719bfd029e6041391d6b6f07daedbf40bd3907f1e409adc6ad427
+  data.tar.gz: 93c14fc2ba44719060b022242bd6d6ded10d4a0664319496a2e32ca6f309ed6d17901e617ee191fd688462e3255f9e5eedae8169c3ca4378377a9d9f61211126

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

@@ -733,11 +733,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?
@@ -832,6 +838,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.16"
 
     # 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.14
+  version: 0.9.16
 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