From 696c95cb904bca6d1a1ee56ca6d0f0a427259b07 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 10 Aug 2019 10:35:00 -0400 Subject: nits --- build_android.sh | 7 ++++--- package.json | 2 +- www/js/EventModalCtrl.js | 3 +-- www/js/NVR.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build_android.sh b/build_android.sh index b7321c8c..64dc7a5c 100755 --- a/build_android.sh +++ b/build_android.sh @@ -49,7 +49,8 @@ build_release() { cp "$NINJAKEYSTORE" platforms/android/ # Make sure native builds are only deployed in devices >= Android 5 - cordova build android --release -- --minSdkVersion=21 --targetSdkVersion=28 --versionCode=${ver} + # minSdk and targetSdk version are in config.xml + cordova build android --release -- --versionCode=${ver} # copy build to release folder and sign cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk release_files/android-release-unsigned.apk @@ -70,8 +71,8 @@ build_release() { echo "***VERSION CODE CHECKS:" for f in release_files/*; do echo "$f:" - `echo $ANDROID_HOME`/build-tools/23.0.1/aapt dump badging $f | grep versionCode - `echo $ANDROID_HOME`/build-tools/23.0.1/aapt dump badging $f | grep native-code + `echo $ANDROID_HOME`/build-tools/${SDK_VERSION}/aapt dump badging $f | grep versionCode + `echo $ANDROID_HOME`/build-tools/${SDK_VERSION}/aapt dump badging $f | grep native-code done } diff --git a/package.json b/package.json index d829b022..6268a446 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.071", + "version": "1.3.074", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 5905c484..ce884f9e 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1,5 +1,4 @@ -import { transcode } from "buffer"; - + // Common Controller for the montage view /* jshint -W041 */ /* jslint browser: true*/ diff --git a/www/js/NVR.js b/www/js/NVR.js index e79878fb..0f5a0656 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.071"; + var zmAppVersion = "1.3.074"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; -- cgit v1.2.3