From cac8a3868ee001b839bb005a9542bdba52cc7e82 Mon Sep 17 00:00:00 2001 From: John Lyon-Smith Date: Sat, 14 Apr 2018 05:21:15 -0700 Subject: [PATCH] Update version and add rename script --- mobile/android/rename-apk | 8 ++++++++ mobile/ios/DeightonAR/Info.plist | 2 +- mobile/src/version.js | 2 +- version.json5 | 12 +++++++++--- website/src/version.js | 2 +- 5 files changed, 20 insertions(+), 6 deletions(-) create mode 100755 mobile/android/rename-apk diff --git a/mobile/android/rename-apk b/mobile/android/rename-apk new file mode 100755 index 0000000..471716e --- /dev/null +++ b/mobile/android/rename-apk @@ -0,0 +1,8 @@ +#!/bin/bash + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +OLD_APK=${SCRIPT_DIR}/app/build/outputs/apk/app-release.apk +VERSION=$(cat $SCRIPT_DIR/../../scratch/version.txt) +NEW_APK=$(dirname $OLD_APK)/deighton-ar-${VERSION}.apk + +mv $OLD_APK $NEW_APK diff --git a/mobile/ios/DeightonAR/Info.plist b/mobile/ios/DeightonAR/Info.plist index 1579c87..7216e24 100644 --- a/mobile/ios/DeightonAR/Info.plist +++ b/mobile/ios/DeightonAR/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 20180413.1 + 20180414.1 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/mobile/src/version.js b/mobile/src/version.js index 3a00023..0241acf 100644 --- a/mobile/src/version.js +++ b/mobile/src/version.js @@ -1,6 +1,6 @@ export const versionInfo = { version: '1.0.0', - fullVersion: '1.0.0-20180413.1', + fullVersion: '1.0.0-20180414.1', title: 'Deighton AR System', copyright: '© 2018, Kingston Software Solutions.', supportEmail: 'support@kss.us.com', diff --git a/version.json5 b/version.json5 index 4275de2..767744b 100644 --- a/version.json5 +++ b/version.json5 @@ -7,6 +7,7 @@ "mobile/ios/DeightonAR/info.plist", "mobile/android/app/build.gradle", "mobile/android/app/src/main/AndroidManifest.xml", + "scratch/version.txt", "scratch/version.tag.txt", "scratch/version.desc.txt" ], @@ -15,7 +16,7 @@ major: 1, minor: 0, patch: 0, - build: 20180413, + build: 20180414, revision: 1, sequence: 1, tz: "America/Los_Angeles", @@ -102,12 +103,17 @@ }, { name: "Commit tag file", - glob: "**/*.tag.txt", + glob: "**/version.tag.txt", write: "v${major}.${minor}.${patch}" }, + { + name: "Full version file", + glob: "**/version.txt", + write: "${major}.${minor}.${patch}-${build}.${revision}" + }, { name: "Commit tag description file", - glob: "**/*.desc.txt", + glob: "**/version.desc.txt", write: "Version ${major}.${minor}.${patch}-${build}.${revision}" }, { diff --git a/website/src/version.js b/website/src/version.js index 3a00023..0241acf 100644 --- a/website/src/version.js +++ b/website/src/version.js @@ -1,6 +1,6 @@ export const versionInfo = { version: '1.0.0', - fullVersion: '1.0.0-20180413.1', + fullVersion: '1.0.0-20180414.1', title: 'Deighton AR System', copyright: '© 2018, Kingston Software Solutions.', supportEmail: 'support@kss.us.com',