bin/calabash-android-build.rb in calabash-android-0.6.1.pre2 vs bin/calabash-android-build.rb in calabash-android-0.7.0

- old
+ new

@@ -20,11 +20,11 @@ puts "You can resign the app with #{keystores.first.location} by running: calabash-android resign #{app}" puts "" puts "Notice that resigning an app might break some functionality." - puts "Getting a copy of the certificate used when the app was build will in general be more reliable." + puts "Getting a copy of the certificate used when the app was built will in general be more reliable." exit 1 end test_server_file_name = test_server_path(app) @@ -45,10 +45,10 @@ unless system %Q{"#{RbConfig.ruby}" -pi.bak -e "gsub(/#testPackage#/, '#{package_name(app)}.test')" AndroidManifest.xml} raise "Could not replace test package name in manifest" end - unless system %Q{"#{Env.tools_dir}/aapt" package -M AndroidManifest.xml -I "#{android_platform}/android.jar" -F dummy.apk} + unless system %Q{"#{Calabash::Android::Dependencies.aapt_path}" package -M AndroidManifest.xml -I "#{android_platform}/android.jar" -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|