bin/calabash-android-build.rb in calabash-android-0.8.3.pre1 vs bin/calabash-android-build.rb in calabash-android-0.8.3
- old
+ new
@@ -48,23 +48,25 @@
unless system %Q{"#{Calabash::Android::Dependencies.aapt_path}" package -M AndroidManifest.xml -I "#{Calabash::Android::Dependencies.android_jar_path}" -F dummy.apk}
raise "Could not create dummy.apk"
end
- Zip::File.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
- Zip::File.open("TestServer.apk") do |zip_file|
- begin
- check_file("AndroidManifest.xml")
- manifest_exists = true
- rescue
- manifest_exists = false
- end
+ Calabash::Utils.with_silent_zip do
+ Zip::File.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
+ Zip::File.open("TestServer.apk") do |zip_file|
+ begin
+ check_file("AndroidManifest.xml")
+ manifest_exists = true
+ rescue
+ manifest_exists = false
+ end
- if manifest_exists
- zip_file.remove("AndroidManifest.xml")
- end
+ if manifest_exists
+ zip_file.remove("AndroidManifest.xml")
+ end
- zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
+ zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
+ end
end
end
keystore.sign_apk("#{workspace_dir}/TestServer.apk", test_server_file_name)
begin