calabash-android 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 356ad3323356f3f66bb017a8b926c461a0cd98fc
-  data.tar.gz: e77f4b392f2a2d6a473fb101a4e8546edf279238
+  metadata.gz: 94c6e2b470cedf9656247543c5dc1770aabcc1f4
+  data.tar.gz: 802fa73e9c59c81b9bce5a916caf8efea09120ae
 SHA512:
-  metadata.gz: f224a135f4f5d667c3454f0cb824b259d16e220fdc3dd2226320b48e9daf7074e21f15f16901da4cd405ad2a4b836dfb78a5a2b57ae7a47caf09b58ee00fd61a
-  data.tar.gz: 11c67a0a5c89e1412359c374801ce2ef16f135b9a98ce212e246ba09754082981b40fae28cdd79a3511e3ce8db726fdeacdadf251dc3c1dc4c14a8e7d67c549c
+  metadata.gz: 48cf3da5067bafc7c92ced64f27ddec626bbe51e242a912778be62ccc75e7aa03851e50637d3ba9dd1abd1c1cdf4945bd04dacbbd490ea3a9f839814f518f836
+  data.tar.gz: 3d94971acca24214001a20581a8257583e157ea4ddd3d47b9604b52e3bc2675df4f030538b9a9a742e4ce0d238c922e6e55b4653487b80c91246eff475372892

data/CHANGES.txt

@@ -1,3 +1,8 @@
+0.5.11
+      Change the way Calabash (re)signs applications. Use the encryption
+      of the supplied keystore, and always use SHA1 as the digest
+      algorithm.
+
 0.5.10
       Fix building and signing not working if the language of the
       host computer was not English.

data/lib/calabash-android/java_keystore.rb

@@ -48,7 +48,15 @@ class JavaKeystore
     raise "Cannot sign with a miss configured keystore" if errors
     raise "No such file: #{apk_path}" unless File.exists?(apk_path)
 
-    unless system_with_stdout_on_success(Env.jarsigner_path, '-sigalg', signature_algorithm_name, '-digestalg', 'SHA1', '-signedjar', dest_path, '-storepass', password, '-keystore',  location, apk_path, keystore_alias)
+    # E.g. MD5withRSA or MD5withRSAandMGF1
+    encryption = signature_algorithm_name.split('with')[1].split('and')[0]
+    signing_algorithm = "SHA1with#{encryption}"
+    digest_algorithm = 'SHA1'
+
+    log "Signing using the signature algorithm: '#{signing_algorithm}'"
+    log "Signing using the digest algorithm: '#{digest_algorithm}'"
+
+    unless system_with_stdout_on_success(Env.jarsigner_path, '-sigfile', 'CERT', '-sigalg', signing_algorithm, '-digestalg', digest_algorithm, '-signedjar', dest_path, '-storepass', password, '-keystore',  location, apk_path, keystore_alias)
       raise "Could not sign app: #{apk_path}"
     end
   end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.10"
+    VERSION = "0.5.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber