From fd5a28a4e9fa324175c21326b7de909eb2a91e00 Mon Sep 17 00:00:00 2001 From: John Lyon-Smith Date: Fri, 6 Apr 2018 18:00:37 -0700 Subject: [PATCH] Add iOS version number --- mobile/ios/DeightonAR/Info.plist | 4 ++-- package.json | 2 +- version.json5 | 23 +++++++++++++++++++---- website/.env | 3 +-- website/src/version.js | 4 ++-- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/mobile/ios/DeightonAR/Info.plist b/mobile/ios/DeightonAR/Info.plist index 8935014..e19103f 100644 --- a/mobile/ios/DeightonAR/Info.plist +++ b/mobile/ios/DeightonAR/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + 1.2.0 CFBundleSignature ???? CFBundleVersion - 20180328.0 + 20180406.2 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/package.json b/package.json index 06ef833..c39b0d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "deighton-ar", - "version": "0.2.0", + "version": "1.2.0", "description": "Deighton AR Training System", "main": "index.js", "repository": { diff --git a/version.json5 b/version.json5 index da8c375..3b65c7a 100644 --- a/version.json5 +++ b/version.json5 @@ -3,16 +3,17 @@ "package.json", "website/.env", "website/src/version.js", + "mobile/ios/DeightonAR/info.plist", "scratch/version.tag.txt", "scratch/version.desc.txt" ], buildFormat: "full", tags: { - major: 0, + major: 1, minor: 2, patch: 0, - build: 20180307, - revision: 0, + build: 20180406, + revision: 2, tz: "America/Los_Angeles", title: "Deighton AR System", copyright: "© 2018, Kingston Software Solutions.", @@ -53,6 +54,20 @@ } ] }, + { + name: "Xcode Info PList", + glob: "**/info.plist", + updates: [ + { + search: "(?CFBundleVersion\n[\t ]*)(\\d+\\.\\d+)(?)", + replace: "${begin}${build}.${revision}${end}" + }, + { + search: "(?CFBundleShortVersionString\n[\t ]*)(\\d+\\.\\d+\\.\\d+)(?)", + replace: "${begin}${major}.${minor}.${patch}${end}" + } + ] + }, { name: "Commit tag file", glob: "**/*.tag.txt", @@ -65,7 +80,7 @@ }, { name: "Website environment file", - glob: "website/.env", + glob: "**/.env", write: "REACT_APP_TITLE=${title}" } ] diff --git a/website/.env b/website/.env index c2b97c5..ff5808a 100644 --- a/website/.env +++ b/website/.env @@ -1,2 +1 @@ -REACT_APP_TITLE=Deighton AR System -REACT_APP_SUPPORT_EMAIL=support@kss.us.com +REACT_APP_TITLE=Deighton AR System \ No newline at end of file diff --git a/website/src/version.js b/website/src/version.js index 1890112..f328ec7 100644 --- a/website/src/version.js +++ b/website/src/version.js @@ -1,6 +1,6 @@ export const versionInfo = { - version: '0.2.0', - fullVersion: '0.2.0-20180307.0', + version: '1.2.0', + fullVersion: '1.2.0-20180406.2', title: 'Deighton AR System', copyright: '© 2018, Kingston Software Solutions.', supportEmail: 'support@kss.us.com',