diff --git a/phoneClients/android/.idea/workspace.xml b/phoneClients/android/.idea/workspace.xml index 6b57a65..a8e1f9e 100644 --- a/phoneClients/android/.idea/workspace.xml +++ b/phoneClients/android/.idea/workspace.xml @@ -41,10 +41,6 @@ - - - - @@ -142,8 +138,8 @@ - - + + @@ -976,7 +972,7 @@ @@ -1446,7 +1442,7 @@ - + @@ -2023,8 +2019,8 @@ - - + + diff --git a/phoneClients/android/build/intermediates/model_data.bin b/phoneClients/android/build/intermediates/model_data.bin new file mode 100644 index 0000000..19b37e2 --- /dev/null +++ b/phoneClients/android/build/intermediates/model_data.bin Binary files differ diff --git a/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj b/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj index 96bb38f..c460a91 100644 --- a/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj +++ b/phoneClients/ios/GpsTracker.xcodeproj/project.pbxproj @@ -296,7 +296,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -329,7 +329,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; diff --git a/phoneClients/ios/GpsTracker/GpsTracker-Info.plist b/phoneClients/ios/GpsTracker/GpsTracker-Info.plist index 2c2d26f..611aa65 100644 --- a/phoneClients/ios/GpsTracker/GpsTracker-Info.plist +++ b/phoneClients/ios/GpsTracker/GpsTracker-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.2.4 + 3.2.5 CFBundleSignature ???? CFBundleVersion - 2 + 3 LSRequiresIPhoneOS UIBackgroundModes diff --git a/phoneClients/ios/Podfile b/phoneClients/ios/Podfile index 6d5aa37..4400945 100644 --- a/phoneClients/ios/Podfile +++ b/phoneClients/ios/Podfile @@ -1,2 +1,2 @@ -platform :ios, '6.0' -pod "AFNetworking/NSURLConnection", "~> 2.0" +platform :ios, '7.0' +pod 'AFNetworking', '~> 2.2' \ No newline at end of file diff --git a/phoneClients/ios/Podfile.lock b/phoneClients/ios/Podfile.lock index 60ef8bb..c366e90 100644 --- a/phoneClients/ios/Podfile.lock +++ b/phoneClients/ios/Podfile.lock @@ -1,16 +1,30 @@ PODS: - - AFNetworking/NSURLConnection (2.3.1): + - AFNetworking (2.4.1): + - AFNetworking/NSURLConnection + - AFNetworking/NSURLSession - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (2.3.1) - - AFNetworking/Security (2.3.1) - - AFNetworking/Serialization (2.3.1) + - AFNetworking/UIKit + - AFNetworking/NSURLConnection (2.4.1): + - AFNetworking/Reachability + - AFNetworking/Security + - AFNetworking/Serialization + - AFNetworking/NSURLSession (2.4.1): + - AFNetworking/Reachability + - AFNetworking/Security + - AFNetworking/Serialization + - AFNetworking/Reachability (2.4.1) + - AFNetworking/Security (2.4.1) + - AFNetworking/Serialization (2.4.1) + - AFNetworking/UIKit (2.4.1): + - AFNetworking/NSURLConnection + - AFNetworking/NSURLSession DEPENDENCIES: - - AFNetworking/NSURLConnection (~> 2.0) + - AFNetworking (~> 2.2) SPEC CHECKSUMS: - AFNetworking: 6d7b76aa5d04c8c37daad3eef4b7e3f2a7620da3 + AFNetworking: 0aabc6fae66d6e5d039eeb21c315843c7aae51ab COCOAPODS: 0.33.1