diff --git a/mobile/.gitignore b/mobile/.gitignore index 914ff82..a0e735c 100644 --- a/mobile/.gitignore +++ b/mobile/.gitignore @@ -4,6 +4,7 @@ ios/Pods/ ios/DerivedData/ ios/**/xcuserdata/ android/.idea/ +android/**/local.properties android/**/build/** android/**/.gradle/** **/.idea/** diff --git a/mobile/.idea/mobile.iml b/mobile/.idea/mobile.iml deleted file mode 100644 index 062f5f7..0000000 --- a/mobile/.idea/mobile.iml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mobile/.idea/modules.xml b/mobile/.idea/modules.xml deleted file mode 100644 index 348e586..0000000 --- a/mobile/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/mobile/android/app/app.iml b/mobile/android/app/app.iml deleted file mode 100644 index c6a8368..0000000 --- a/mobile/android/app/app.iml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 159b580..16edea0 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -94,8 +94,8 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion "27.0.3" + compileSdkVersion 25 defaultConfig { applicationId "com.deightonar" @@ -149,9 +149,10 @@ android { } dependencies { - compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:25.0.0" - compile "com.facebook.react:react-native:+" // From node_modules + compile fileTree(include: ['*.jar'], dir: 'libs') + compile 'com.android.support:appcompat-v7:25.0.0' + compile 'com.facebook.react:react-native:+' + // From node_modules compile project(':gvr_common') compile project(':arcore_client') compile project(path: ':react_viro') diff --git a/mobile/android/app/local.properties b/mobile/android/app/local.properties deleted file mode 100644 index 7d39647..0000000 --- a/mobile/android/app/local.properties +++ /dev/null @@ -1,8 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Sat Mar 31 13:51:09 PDT 2018 -sdk.dir=/Users/john/Library/Android/sdk diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle index b712c1c..8717e60 100644 --- a/mobile/android/build.gradle +++ b/mobile/android/build.gradle @@ -2,6 +2,7 @@ buildscript { repositories { + google() jcenter() } dependencies { diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties index 1b033a6..b6517bb 100644 --- a/mobile/android/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon Mar 26 18:20:46 PDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/mobile/android/local.properties b/mobile/android/local.properties deleted file mode 100644 index f6ccdad..0000000 --- a/mobile/android/local.properties +++ /dev/null @@ -1,11 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Wed Mar 07 13:03:42 PST 2018 -sdk.dir=/Users/john/Library/Android/sdk diff --git a/mobile/ios/DeightonAR/Info.plist b/mobile/ios/DeightonAR/Info.plist index 297cf94..a5c9c69 100644 --- a/mobile/ios/DeightonAR/Info.plist +++ b/mobile/ios/DeightonAR/Info.plist @@ -23,7 +23,7 @@ CFBundleSignature ???? CFBundleVersion - 20180501.1 + 20180509.0 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/mobile/src/version.js b/mobile/src/version.js index 0084fef..eda1d28 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-20180501.1', + fullVersion: '1.0.0-20180509.0', title: 'Deighton AR System', copyright: '© 2018, Kingston Software Solutions.', supportEmail: 'support@kss.us.com', diff --git a/server/src/version.js b/server/src/version.js index 0084fef..eda1d28 100644 --- a/server/src/version.js +++ b/server/src/version.js @@ -1,6 +1,6 @@ export const versionInfo = { version: '1.0.0', - fullVersion: '1.0.0-20180501.1', + fullVersion: '1.0.0-20180509.0', title: 'Deighton AR System', copyright: '© 2018, Kingston Software Solutions.', supportEmail: 'support@kss.us.com', diff --git a/version.json5 b/version.json5 index a7006c7..94e0310 100644 --- a/version.json5 +++ b/version.json5 @@ -17,8 +17,8 @@ major: 1, minor: 0, patch: 0, - build: 20180501, - revision: 1, + build: 20180509, + revision: 0, sequence: 1, tz: "America/Los_Angeles", title: "Deighton AR System", diff --git a/website/src/version.js b/website/src/version.js index 0084fef..eda1d28 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-20180501.1', + fullVersion: '1.0.0-20180509.0', title: 'Deighton AR System', copyright: '© 2018, Kingston Software Solutions.', supportEmail: 'support@kss.us.com',