diff --git a/Makefile b/Makefile index c79ed65cd..2cc12a548 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,9 @@ android-prod: cordova/build.sh ANDROID --clear cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg cd cordova/project && cordova build android --release + jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play + ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk + android-debug: cordova/build.sh ANDROID --dbgjs --clear diff --git a/cordova/android/build-extras.gradle b/cordova/android/build-extras.gradle new file mode 100644 index 000000000..bd21ff7f3 --- /dev/null +++ b/cordova/android/build-extras.gradle @@ -0,0 +1,6 @@ +android { + lintOptions { + disable 'MissingTranslation' + disable 'ExtraTranslation' + } +} diff --git a/cordova/build.sh b/cordova/build.sh index 736ba8136..ba85d6ed0 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -174,6 +174,9 @@ if [ $CURRENT_OS == "ANDROID" ]; then # cp android/AndroidManifest.xml $PROJECT/platforms/android/AndroidManifest.xml # checkOK + + cp android/build-extras.gradle $PROJECT/platforms/android/build-extras.gradle + checkOK cp android/project.properties $PROJECT/platforms/android/project.properties checkOK diff --git a/cordova/config.xml b/cordova/config.xml index 6cd0c70c9..9a55e492c 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.4.1" + android-versionCode="51" + ios-CFBundleVersion="1.4.1"> Copay A secure bitcoin wallet for friends and companies. diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index 9c6b2fcbd..0eb24c975 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.0 + 1.4.1 CFBundleSignature ???? CFBundleVersion - 1.4.0 + 1.4.1 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index 10c9e375e..5ba5f6c11 100644 --- a/cordova/wp/Package.appxmanifest +++ b/cordova/wp/Package.appxmanifest @@ -1,6 +1,6 @@  - + Copay Wallet diff --git a/package.json b/package.json index a410d4a42..ec8a52fd2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.4.0", + "version": "1.4.1", "keywords": [ "wallet", "copay", diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index 2d6bd3a0c..473b8eeec 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.4.0 +Version=1.4.1 Name=Copay Comment=A multisignature wallet Exec=copay diff --git a/webkitbuilds/setup-win32.iss b/webkitbuilds/setup-win32.iss index de7cbc27d..2f12f30e9 100755 --- a/webkitbuilds/setup-win32.iss +++ b/webkitbuilds/setup-win32.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.4.0" +#define MyAppVersion "1.4.1" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe" diff --git a/webkitbuilds/setup-win64.iss b/webkitbuilds/setup-win64.iss index 5f99d48c5..1c84dab16 100755 --- a/webkitbuilds/setup-win64.iss +++ b/webkitbuilds/setup-win64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.4.0" +#define MyAppVersion "1.4.1" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe"