calabash-android 0.9.9 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffee0c3a564354c2caec0ab6a8d6a313b2166b2f04c381c52708eb98e4d9d3cc
-  data.tar.gz: 0b4d4c9b52e6380a9f5990e69a61fa1e9c9b8514079d34a2387a48ffcd763c84
+  metadata.gz: 5c9d04b019926835a04fbc8b2a6ceb564330f3edf856714f6c29eea0503c5a51
+  data.tar.gz: 438bc3d451e570d80acaeb5120f38b3bf4037c1812fc6125ce4a710a836ad85f
 SHA512:
-  metadata.gz: 0d9e35881dac6ca416cb357572ba337e6276412210e32bb2fe8e4e58e94f0e14b0b91c27a7f3111c8dc1c0d3077a9c9637329590ba03ec37bb562f591f98acf8
-  data.tar.gz: 0029141008ce6f26a324e316b4b60b46b0103b56ba1b0cc94fd461c660383a71a9d846b5f7c5df926eadee1b0b7da6998c580f1fe919d826906ee9df7fe878ab
+  metadata.gz: 2efd50e4d2b63e59f0e5c6efca391deebbff7c528b702570f871add5735ea7d61a72f793788719bfd029e6041391d6b6f07daedbf40bd3907f1e409adc6ad427
+  data.tar.gz: 93c14fc2ba44719060b022242bd6d6ded10d4a0664319496a2e32ca6f309ed6d17901e617ee191fd688462e3255f9e5eedae8169c3ca4378377a9d9f61211126

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="#testPackage#"
-    android:versionCode="4"
-    android:versionName="0.4.0">
+    android:versionCode="15"
+    android:versionName="0.9.15">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="22" />
+    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="28" />
 
     <application android:label="instrumentation_backend"
       android:largeHeap="true"
@@ -43,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" />
@@ -58,5 +60,4 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-
 </manifest>

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.9"
+    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.9
+  version: 0.9.16
 platform: ruby
 authors:
 - Jonas Maturana Larsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-17 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'
-    - - "<"
+    - - '='
       - !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'
-    - - "<"
+    - - '='
       - !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
@@ -294,7 +288,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'calabash-android drives tests for native  and hybrid Android apps. '
+description: 'calabash-android drives tests for native and hybrid Android apps. '
 email:
 - jonas@lesspainful.com
 executables:
@@ -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.3
-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: []