From dd2adf807ffa44921b9e8222d6d41de7bb7814f1 Mon Sep 17 00:00:00 2001
From: John Lyon-Smith <john@lyon-smith.org>
Date: Sat, 7 Apr 2018 11:00:51 -0700
Subject: [PATCH] Android version information

---
 mobile/android/app/build.gradle               |  2 +-
 .../android/app/src/main/AndroidManifest.xml  |  2 +-
 mobile/ios/DeightonAR/Info.plist              |  4 +--
 package.json                                  |  2 +-
 version.json5                                 | 36 +++++++++++++++++--
 website/src/version.js                        |  4 +--
 6 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 14897dd..0eb66cc 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -102,7 +102,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml
index ea1b81f..68c6a6e 100644
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.deightonar"
     android:versionCode="1"
-    android:versionName="1.0">
+    android:versionName="1.0.0">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
diff --git a/mobile/ios/DeightonAR/Info.plist b/mobile/ios/DeightonAR/Info.plist
index f01c2cf..5c4bf03 100644
--- a/mobile/ios/DeightonAR/Info.plist
+++ b/mobile/ios/DeightonAR/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20180406.6</string>
+	<string>20180407.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
diff --git a/package.json b/package.json
index c39b0d4..39e95e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deighton-ar",
-  "version": "1.2.0",
+  "version": "1.0.0",
   "description": "Deighton AR Training System",
   "main": "index.js",
   "repository": {
diff --git a/version.json5 b/version.json5
index b5b0a68..8c062ed 100644
--- a/version.json5
+++ b/version.json5
@@ -4,16 +4,18 @@
     "website/.env",
     "website/src/version.js",
     "mobile/ios/DeightonAR/info.plist",
+    "mobile/android/app/build.gradle",
+    "mobile/android/app/src/main/AndroidManifest.xml",
     "scratch/version.tag.txt",
     "scratch/version.desc.txt"
   ],
   buildFormat: "full",
   tags: {
     major: 1,
-    minor: 2,
+    minor: 0,
     patch: 0,
-    build: 20180406,
-    revision: 6,
+    build: 20180407,
+    revision: 3,
     sequence: 1,
     tz: "America/Los_Angeles",
     title: "Deighton AR System",
@@ -69,6 +71,34 @@
         }
       ]
     },
+    {
+      name: "Gradle Script",
+      glob: "**/build.gradle",
+      updates: [
+        {
+          search: "(?<begin>versionCode +)\\d+",
+          replace: "${begin}${sequence}"
+        },
+        {
+          search: "(?<begin>versionName +\")\\d+\\.\\d+\\.\\d+(?<end>\")",
+          replace: "${begin}${major}.${minor}.${patch}${end}"
+        }
+      ]
+    },
+    {
+      name: "Android Manifest",
+      glob: "**/AndroidManifest.xml",
+      updates: [
+        {
+          search: "(?<begin>android:versionCode=\")\\d?(?<end>\")",
+          replace: "${begin}${sequence}${end}"
+        },
+        {
+          search: "(?<begin>android:versionName=\")\\d+\\.\\d+\\.\\d+(?<end>\")",
+          replace: "${begin}${major}.${minor}.${patch}${end}"
+        }
+      ]
+    },
     {
       name: "Commit tag file",
       glob: "**/*.tag.txt",
diff --git a/website/src/version.js b/website/src/version.js
index 02f0ed3..99c5cc3 100644
--- a/website/src/version.js
+++ b/website/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.2.0',
-  fullVersion: '1.2.0-20180406.6',
+  version: '1.0.0',
+  fullVersion: '1.0.0-20180407.3',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',