Fix version regexp

Tweaks for Android
Version 1.4.1-20180628.0
2018-06-28 09:54:15 -07:00 · 2018-06-28 09:51:26 -07:00 · 2018-06-28 08:34:14 -07:00
12 changed files with 31 additions and 24 deletions
--- a/mobile/android/DeightonAR.iml
+++ b/mobile/android/DeightonAR.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="DeightonAR" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/app" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="DeightonAR" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="java-gradle" name="Java-Gradle">
      <configuration>
@@ -8,7 +8,7 @@
      </configuration>
    </facet>
  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
--- a/mobile/android/app/app.iml
+++ b/mobile/android/app/app.iml
@@ -22,7 +22,7 @@
      </configuration>
    </facet>
  </component>
-  <component name="NewModuleRootManager">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
    <exclude-output />
@@ -103,7 +103,7 @@
      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-25.0.0" level="project" />
    <orderEntry type="library" name="Gradle: com.facebook.fresco:fbcore-1.3.0" level="project" />
@@ -149,6 +149,5 @@
    <orderEntry type="module" module-name="react-native-maps" />
    <orderEntry type="module" module-name="react-native-image-resizer" />
    <orderEntry type="module" module-name="react-native-image-picker" />
-    <orderEntry type="library" name="Gradle: android-android-27" level="project" />
  </component>
 </module>
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -101,8 +101,8 @@ android {
        applicationId "com.deightonar"
        minSdkVersion 24
        targetSdkVersion 27
-        versionCode 13
-        versionName "1.4.0"
+        versionCode 14
+        versionName "1.4.1"
        ndk {
            abiFilters "armeabi-v7a", "x86"
        }
--- 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="11"
-    android:versionName="1.4.0">
+    android:versionName="1.4.1">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
--- a/mobile/ios/DeightonAR/Info.plist
+++ b/mobile/ios/DeightonAR/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20180627.0</string>
+	<string>20180628.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
--- a/mobile/src/ui/BubbleLoader.js
+++ b/mobile/src/ui/BubbleLoader.js
@@ -20,7 +20,7 @@ export class BubbleLoader extends React.Component {
        this.animatedScales.map((value, i) =>
          Animated.sequence([
            Animated.timing(value, {
-              toValue: 0.0,
+              toValue: 0.01,
              duration: 800,
              delay: 200 * i,
              easing: Easing.out(Easing.sin),
--- a/mobile/src/ui/Geolocation.js
+++ b/mobile/src/ui/Geolocation.js
@@ -28,11 +28,19 @@ export class Geolocation extends Component {
            this.props.onUpdate(position)
          )),
            null,
-            { distanceFilter: 5, maximumAge: 0, enableHighAccuracy: true }
+            {
+              distanceFilter: 5,
+              maximumAge: 0,
+              timeout: 20000,
+            }
        }
      },
      null,
-      { distanceFilter: 5, maximumAge: 0, enableHighAccuracy: true }
+      {
+        distanceFilter: 5,
+        maximumAge: 0,
+        timeout: 20000,
+      }
    )
  }

--- a/mobile/src/version.js
+++ b/mobile/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.4.0',
-  fullVersion: '1.4.0-20180627.0',
+  version: '1.4.1',
+  fullVersion: '1.4.1-20180628.0',
  title: 'Deighton AR System',
  copyright: '© 2018, Kingston Software Solutions.',
  supportEmail: 'support@kss.us.com',
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "deighton-ar",
-  "version": "1.4.0",
+  "version": "1.4.1",
  "description": "Deighton AR Training System",
  "main": "index.js",
  "repository": {
--- a/server/src/version.js
+++ b/server/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.4.0',
-  fullVersion: '1.4.0-20180627.0',
+  version: '1.4.1',
+  fullVersion: '1.4.1-20180628.0',
  title: 'Deighton AR System',
  copyright: '© 2018, Kingston Software Solutions.',
  supportEmail: 'support@kss.us.com',
--- a/version.json5
+++ b/version.json5
@@ -16,10 +16,10 @@
  tags: {
    major: 1,
    minor: 4,
-    patch: 0,
-    build: 20180627,
+    patch: 1,
+    build: 20180628,
    revision: 0,
-    sequence: 13,
+    sequence: 14,
    tz: "America/Los_Angeles",
    title: "Deighton AR System",
    copyright: "© 2018, Kingston Software Solutions.",
@@ -93,7 +93,7 @@
      glob: "**/AndroidManifest.xml",
      updates: [
        {
-          search: "(?<begin>android:versionCode=\")\\d?(?<end>\")",
+          search: "(?<begin>android:versionCode=\")\\d+(?<end>\")",
          replace: "${begin}${sequence}${end}"
        },
        {
--- a/website/src/version.js
+++ b/website/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.4.0',
-  fullVersion: '1.4.0-20180627.0',
+  version: '1.4.1',
+  fullVersion: '1.4.1-20180628.0',
  title: 'Deighton AR System',
  copyright: '© 2018, Kingston Software Solutions.',
  supportEmail: 'support@kss.us.com',
Author	SHA1	Message	Date
John Lyon-Smith	355bb98b28	Fix version regexp	2018-06-28 09:54:15 -07:00
John Lyon-Smith	8f9efa4373	Tweaks for Android	2018-06-28 09:51:26 -07:00
John Lyon-Smith	94c5e804a8	Version 1.4.1-20180628.0	2018-06-28 08:34:14 -07:00