calabash-android 0.9.1.pre2 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb527ede0676e2c566700c53984572883dde21ae
-  data.tar.gz: 9b13e1012370185f9c2369e0e65631354bb13fe7
+  metadata.gz: ee0598b0e7e5ea11cbb374d47394738872ff46a2
+  data.tar.gz: 1f17e6fd74a29735e83eef0760eb1f989fc924a4
 SHA512:
-  metadata.gz: 372f5ce062f0176201a9b67205020a70b959cfbfb89ccd2053fb223bec88739b4ac816be027110b52f87f5066a816eb2cfc03f6bf62e49eed431f15fa6d7ab8f
-  data.tar.gz: 6b2ecd546dfb0db66dfdfaa62735d9af30f103b5596d910ee6980015b6b580168f6fdd5187af6fb6aff376482c97564baa4cc48d84659fdfe7fe2b6b0270f9ba
+  metadata.gz: f8d09b172d60359b7f1e09e85a04da4b1f5a2457098281e8381530f6a8475702cb428e283461daac707d5cf599085aa04fabace0229f77c57012fe8e8d9b30e0
+  data.tar.gz: d489447e43b0a99e279a1e64dd529635935819d9de678a1f5f92b632254e69422ff1a6044a9ef98af26f2a9b28193939b3b755467756eecb01870e92b115d6a5

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

@@ -51,8 +51,8 @@
         android:noHistory="true"
         android:excludeFromRecents="true"/>
     </application>
-    <uses-sdk android:minSdkVersion="4"
-        android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="8"
+        android:targetSdkVersion="22"/>
     <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" />

data/lib/calabash-android/monkey_helpers.rb

@@ -99,6 +99,8 @@ module Calabash
       def kill_existing_monkey_processes
         kill_monkey_processes_on_host
         kill_monkey_processes_on_device
+        @@monkey_port = nil
+        @@monkey_pid = nil
       end
 
       def monkey_tap(x, y, should_start_monkey=true)

data/lib/calabash-android/operations.rb

@@ -408,14 +408,20 @@ module Calabash module Android
       end
 
       def uninstall_app(package_name)
-        log "Uninstalling: #{package_name}"
-        log `#{adb_command} uninstall #{package_name}`
+        exists = application_installed?(package_name)
+        
+        if exists
+          log "Uninstalling: #{package_name}"
+          log `#{adb_command} uninstall #{package_name}`
 
-        succeeded = !application_installed?(package_name)
+          succeeded = !application_installed?(package_name)
 
-        unless succeeded
-          ::Cucumber.wants_to_quit = true
-          raise "#{package_name} was not uninstalled. Aborting!"
+          unless succeeded
+            ::Cucumber.wants_to_quit = true
+            raise "#{package_name} was not uninstalled. Aborting!"
+          end
+        else
+          log "Package not installed: #{package_name}. Skipping uninstall."
         end
       end
 
@@ -789,10 +795,13 @@ module Calabash module Android
 
         start_application(options[:intent])
 
-        # What is Calabash tracking? Read this post for information
-        # No private data (like ip addresses) are collected
+        # What was Calabash tracking? Read this post for information
+        # No private data (like ip addresses) were collected
         # https://github.com/calabash/calabash-android/issues/655
-        Calabash::Android::UsageTracker.new.post_usage_async
+        #
+        # Removing usage tracking to avoid problems with EU General Data
+        # Protection Regulation which takes effect in 2018.
+        # Calabash::Android::UsageTracker.new.post_usage_async
       end
 
       def start_application(intent)

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.9.1.pre2"
+    VERSION = "0.9.2"
   end
 end

data/lib/calabash-android/wait_helpers.rb

@@ -18,8 +18,8 @@ module Calabash
 
       def wait_for(options_or_timeout=DEFAULT_OPTS, &block)
         #note Hash is preferred, number acceptable for backwards compat
-        timeout = options_or_timeout || default_timeout
         default_timeout = DEFAULT_OPTS[:timeout]
+        timeout = options_or_timeout || default_timeout
         post_timeout = DEFAULT_OPTS[:post_timeout]
         retry_frequency = DEFAULT_OPTS[:retry_frequency]
         timeout_message = DEFAULT_OPTS[:timeout_message]

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.9.1.pre2
+  version: 0.9.2
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -385,14 +385,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
-has_rdoc: