Merge pull request #127 from RomanPodymov/main

Dependencies
aaronpk · Nov 12, 2023 · 34ec266 · 34ec266
2 parents dae56b1 + a32fd4f
commit 34ec266
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/GPSLogger/GLManager.m b/GPSLogger/GLManager.m
@@ -185,7 +185,7 @@ - (void)sendQueueNow {
 
     [self sendingStarted];
 
-    [_httpClient POST:endpoint parameters:postData progress:NULL success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+    [_httpClient POST:endpoint parameters:postData headers:NULL progress:NULL success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         NSLog(@"Response: %@", responseObject);
 
         if(![responseObject respondsToSelector:@selector(objectForKey:)]) {
@@ -277,7 +277,7 @@ - (void)logAction:(NSString *)action {
 
 - (void)accountInfo:(void(^)(NSString *name))block {
     NSString *endpoint = [[NSUserDefaults standardUserDefaults] stringForKey:GLAPIEndpointDefaultsName];
-    [_httpClient GET:endpoint parameters:nil progress:NULL success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+    [_httpClient GET:endpoint parameters:nil headers:nil progress:NULL success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
         NSDictionary *dict = (NSDictionary *)responseObject;
         block((NSString *)[dict objectForKey:@"name"]);
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {

diff --git a/GPSLogger/Info.plist b/GPSLogger/Info.plist
@@ -50,6 +50,10 @@
 	<string>Please enable location services to allow the app to track</string>
 	<key>NSMotionUsageDescription</key>
 	<string>Please enable motion to allow step counting</string>
+	<key>NSUserActivityTypes</key>
+	<array>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER).startTracking</string>
+	</array>
 	<key>UIAppFonts</key>
 	<array>
 		<string>OpenSansCondensed-Bold.ttf</string>
@@ -79,10 +83,6 @@
 			<false/>
 		</dict>
 	</dict>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER).startTracking</string>
-	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/Podfile b/Podfile
@@ -3,7 +3,7 @@
 platform :ios, '11.0'
 
 target 'Overland' do
-	pod 'AFNetworking',		'3.2.1'
-	pod 'FMDB',				'2.7.2'
+	pod 'AFNetworking', '4.0.1'
+	pod 'FMDB', '2.7.5'
 end
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,36 +1,36 @@
 PODS:
-  - AFNetworking (3.2.1):
-    - AFNetworking/NSURLSession (= 3.2.1)
-    - AFNetworking/Reachability (= 3.2.1)
-    - AFNetworking/Security (= 3.2.1)
-    - AFNetworking/Serialization (= 3.2.1)
-    - AFNetworking/UIKit (= 3.2.1)
-  - AFNetworking/NSURLSession (3.2.1):
+  - AFNetworking (4.0.1):
+    - AFNetworking/NSURLSession (= 4.0.1)
+    - AFNetworking/Reachability (= 4.0.1)
+    - AFNetworking/Security (= 4.0.1)
+    - AFNetworking/Serialization (= 4.0.1)
+    - AFNetworking/UIKit (= 4.0.1)
+  - AFNetworking/NSURLSession (4.0.1):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/Reachability (3.2.1)
-  - AFNetworking/Security (3.2.1)
-  - AFNetworking/Serialization (3.2.1)
-  - AFNetworking/UIKit (3.2.1):
+  - AFNetworking/Reachability (4.0.1)
+  - AFNetworking/Security (4.0.1)
+  - AFNetworking/Serialization (4.0.1)
+  - AFNetworking/UIKit (4.0.1):
     - AFNetworking/NSURLSession
-  - FMDB (2.7.2):
-    - FMDB/standard (= 2.7.2)
-  - FMDB/standard (2.7.2)
+  - FMDB (2.7.5):
+    - FMDB/standard (= 2.7.5)
+  - FMDB/standard (2.7.5)
 
 DEPENDENCIES:
-  - AFNetworking (= 3.2.1)
-  - FMDB (= 2.7.2)
+  - AFNetworking (= 4.0.1)
+  - FMDB (= 2.7.5)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - AFNetworking
     - FMDB
 
 SPEC CHECKSUMS:
-  AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
-  FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa
+  AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
+  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
 
-PODFILE CHECKSUM: 6e6a649d028e312855028a64e582180710fd654c
+PODFILE CHECKSUM: 176ba5d340c5becc3b95e34d400a18bba3c89f22
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.12.1