Merge branch 'fix/AFNetworking-warnings' into develop

somia · Apr 2, 2020 · 7a4ff05 · 7a4ff05
2 parents f05d55d + 8cd5e2b
commit 7a4ff05
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/NinchatSDK.podspec b/NinchatSDK.podspec
@@ -40,9 +40,9 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   # Cocoapods dependencies
-  s.dependency "AFNetworking", "~> 3.0"
+  s.dependency "AFNetworking"
   s.dependency "NinchatLowLevelClient"
-  s.dependency "GoogleWebRTC", "~> 1.1"
+  s.dependency "GoogleWebRTC", "~> 1.0"
 
   s.module_name = "NinchatSDK"
   s.requires_arc = true

diff --git a/NinchatSDK.xcodeproj/project.pbxproj b/NinchatSDK.xcodeproj/project.pbxproj
@@ -1237,7 +1237,7 @@
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
-					"\"MobileCoreServices\"",
+					"\"CoreServices\"",
 					"-framework",
 					"\"NinchatLowLevelClient\"",
 					"-framework",
@@ -1292,7 +1292,7 @@
 					"-framework",
 					"\"CoreGraphics\"",
 					"-framework",
-					"\"MobileCoreServices\"",
+					"\"CoreServices\"",
 					"-framework",
 					"\"NinchatLowLevelClient\"",
 					"-framework",

diff --git a/NinchatSDK/UI/ViewControllers/ChatViewController/NINChatViewController.m b/NinchatSDK/UI/ViewControllers/ChatViewController/NINChatViewController.m
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Somia Reality Oy. All rights reserved.
 //
 
-@import MobileCoreServices;
+@import CoreServices;
 @import AVFoundation;
 @import AVKit;
 @import Photos;

diff --git a/NinchatSDK/Utils/NINUtils.m b/NinchatSDK/Utils/NINUtils.m
@@ -7,9 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-
-@import AFNetworking;
-
+#import <AFNetworking/AFNetworking.h>
+#import <CoreServices/CoreServices.h>
 #import "NINUtils.h"
 #import "NINInitialViewController.h"
 
@@ -99,14 +98,12 @@ void fetchSiteConfig(NSString* serverAddress, NSString* configurationKey, fetchS
         });
     };
 
-    AFHTTPSessionManager* manager = [AFHTTPSessionManager manager];
-    [manager GET:url parameters:nil progress:nil success:^(NSURLSessionTask* task, id responseObject) {
-        if ([responseObject isKindOfClass:[NSDictionary class]]) {
+    [[AFHTTPSessionManager manager] GET:url parameters:nil headers:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        if ([responseObject isKindOfClass:[NSDictionary class]])
             callCallback((NSDictionary*)responseObject, nil);
-        } else {
+        else
             callCallback(nil, newError([NSString stringWithFormat:@"Invalid responseObject class: %@", [responseObject class]]));
-        }
-    } failure:^(NSURLSessionTask *operation, NSError *error) {
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
         callCallback(nil, error);
     }];
 }

diff --git a/Podfile b/Podfile
@@ -7,7 +7,7 @@ source 'https://cdn.cocoapods.org/'
 source 'https://github.com/somia/ninchat-podspecs.git'
 
 def all_pods
-    pod 'AFNetworking', '~> 3.0'
+    pod 'AFNetworking'
     pod 'NinchatLowLevelClient', '~> 0.0.40'
     pod 'GoogleWebRTC', '~> 1.1'
 end