diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-03-04 15:11:59 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-03-04 15:11:59 -0500 |
| commit | b4872b1bbcb7b4d53fde81218929851104f405b3 (patch) | |
| tree | 28d37cd632d3f10b9cb88e8a23c8eec7c1b2dd64 | |
| parent | 95c3139d3246db58a9700fc79872c8ac746fc21d (diff) | |
#491 - WTF?!?! Cordova version code generation changed?
| -rwxr-xr-x | build_android.sh | 12 | ||||
| -rw-r--r-- | config.xml | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/build_android.sh b/build_android.sh index 42bb954e..dda3fef1 100755 --- a/build_android.sh +++ b/build_android.sh @@ -30,7 +30,6 @@ if [ "$BUILD_MODE" = "xwalk" ] || [ "$BUILD_MODE" = "all" ]; then echo "Building Release mode for Xwalk android..." echo "--------------------------------------------" - #ionic plugin add cordova-plugin-crosswalk-webview@9.8.0 --variable "XWALK_VERSION"="18+" echo "Removing android and re-adding..." cordova platform remove android cordova platform add android @@ -38,16 +37,13 @@ if [ "$BUILD_MODE" = "xwalk" ] || [ "$BUILD_MODE" = "all" ]; then echo "Adding crosswalk..." cordova plugin add cordova-plugin-crosswalk-webview@2.2.0 --variable XWALK_MODE="lite" --variable "XWALK_VERSION"="17.46.459.1" #ionic plugin add cordova-plugin-crosswalk-webview - # crosswalk handles SSL certificate handling in a different way # need to switch plugins echo "Adding crosswalk cert plugin..." cordova plugin remove cordova-plugin-certificates cordova plugin add https://github.com/danjarvis/cordova-plugin-crosswalk-certificate - #ionic platform remove android - #ionic platform add android cp "$NINJAKEYSTORE" platforms/android/ - cordova build android --release + cordova build android --release # copy builds to my release directory cp platforms/android/build/outputs/apk/android-x86-release-unsigned.apk release_files/ @@ -70,6 +66,9 @@ if [ "$BUILD_MODE" = "native" ] || [ "$BUILD_MODE" = "all" ]; then echo "Building Release mode for android 5+..." echo "--------------------------------------------" + APPVER=`cat config.xml | grep "widget " | sed 's/.* version=\"\([^\"]*\)\" xmlns.*/\1/'` + a=( ${APPVER//./ } ) + vcode="$(((a[0]*10000+a[1]*100+a[2])))9" echo "Removing android and re-adding..." cordova platform remove android @@ -87,8 +86,7 @@ if [ "$BUILD_MODE" = "native" ] || [ "$BUILD_MODE" = "all" ]; then cp "$NINJAKEYSTORE" platforms/android/ # Make sure native builds are only deployed in devices < Android 5 - cordova build android --release -- --minSdkVersion=21 - #ionic build android --release -- --minSdkVersion=19 + cordova build android --release -- --minSdkVersion=21 --versionCode=${vcode} # copy build to release folder and sign cp platforms/android/build/outputs/apk/android-release-unsigned.apk release_files/ @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.39" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.39" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client |