calabash-android 0.9.12 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6953bbcacbb3e2c0d66194026f60b5d8910e1badeeaaa7bd5bc4d2b81df9f7d7
-  data.tar.gz: c7e8a8a63252afc07a5892318694cf277559d6d8975bb5804e67a2f0ae2f4497
+  metadata.gz: 2f0e9088c1966c4589099c7f09f5d0a5277e48f1a65e73688e1de29368b81a0c
+  data.tar.gz: ba67584fac7e43881094e76434c7e40991a963142b87d4c4beee85c2c7681751
 SHA512:
-  metadata.gz: 5e11ca268fdf189290c203cb1a4d05785e363b666bca144a93f0fc9299f1295adac7424a9220ccd2b17e5fdff5aac2262890f2f7f8e64fc80d599e5fbc16b763
-  data.tar.gz: de3ae19b3caa7397040848246331c76b37799e467f9cee3054e64e385b17f6e8b770a83af657e123176c17622d02d70c7d4d0dd839b030de6e7d068bdc10c148
+  metadata.gz: 170fa0be48bddf705ee8b45e5eb9232dc487c99c901aeedba129753d196ed62a4a0b57481f4e1c1942675dc99d9ee011a7ca860b6505c2c366c5640b4ef03bd9
+  data.tar.gz: af98a381ae39d2be77d5a5ae5a20b8a23c25bc4788b7441ffcdf40fc2753a713f2a55ff5fadbc58d7f4b27ddd916ce5777457ad886371b161d225824f1e7e818

data/lib/calabash-android/java_keystore.rb

@@ -51,6 +51,10 @@ class JavaKeystore
 
     # E.g. MD5withRSA or MD5withRSAandMGF1
     encryption = signature_algorithm_name.split('with')[1].split('and')[0]
+
+    # keytool with newer java versions has "Signature algorithm name: SHA1withRSA (weak)"
+    encryption.gsub!(' (weak)', '')
+
     signing_algorithm = "SHA1with#{encryption}"
     digest_algorithm = 'SHA1'
 

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?
@@ -786,7 +792,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 +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.12"
+    VERSION = "0.9.19"
 
     # 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.12
+  version: 0.9.19
 platform: ruby
 authors:
 - Jonas Maturana Larsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-22 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
@@ -372,7 +366,7 @@ homepage: http://github.com/calabash
 licenses:
 - EPL-1.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -387,8 +381,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []