Ios fixes

RNSpotifyRemote.podspec

@@ -13,9 +13,10 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "9.0"
 
   s.source       = { :git => package['repository']['url'], :tag => "v#{s.version}", :submodules => true }
-  s.source_files  = "ios/*.{h,m}","ios/external/SpotifySDK/SpotifyiOS.framework/**/Headers/*.{h,m}"
-  s.preserve_path = "ios/external/SpotifySDK/SpotifyiOS.framework"
-  s.vendored_frameworks = "ios/external/SpotifySDK/SpotifyiOS.framework"
+  s.source_files  = "ios/*.{h,m}"
+  s.preserve_path = "ios/external/SpotifySDK/SpotifyiOS.xcframework"
+
+  s.vendored_frameworks = "ios/external/SpotifySDK/SpotifyiOS.xcframework"
 
   s.dependency 'React-Core'
 

ios/RNSpotifyItem.h

@@ -6,7 +6,7 @@
 //  Copyright © 2018 Facebook. All rights reserved.
 //
 
-#import <SpotifyiOS.h>
+@import SpotifyiOS;
 
 #ifndef RNSpotifyItem_h
 #define RNSpotifyItem_h

ios/RNSpotifyRemoteAppRemote.m

@@ -2,7 +2,7 @@
 #import "RNSpotifyRemoteAppRemote.h"
 #import <AVFoundation/AVFoundation.h>
 #import <React/RCTConvert.h>
-#import <SpotifyiOS.h>
+@import SpotifyiOS;
 #import "RNSpotifyRemoteConvert.h"
 #import "RNSpotifyItem.h"
 #import "RNSpotifyRemoteError.h"

ios/RNSpotifyRemoteAuth.m

@@ -2,7 +2,7 @@
 #import "RNSpotifyRemoteAuth.h"
 #import <AVFoundation/AVFoundation.h>
 #import <React/RCTConvert.h>
-#import <SpotifyiOS.h>
+@import SpotifyiOS;
 #import "RNSpotifyRemoteConvert.h"
 #import "RNSpotifyItem.h"
 #import "RNSpotifyRemoteError.h"
@@ -255,19 +255,7 @@ - (void)initializeSessionManager:(NSDictionary*)options completionCallback:(RNSp
     if (@available(iOS 11, *)) {
         RCTExecuteOnMainQueue(^{
             // Use this on iOS 11 and above to take advantage of SFAuthenticationSession
-            [ self->_sessionManager
-                 initiateSessionWithScope:scope
-                 options:SPTDefaultAuthorizationOption
-            ];
-        });
-    } else {
-        RCTExecuteOnMainQueue(^{
-            // Use this on iOS versions < 11 to use SFSafariViewController
-            [ self->_sessionManager
-                initiateSessionWithScope:scope
-                options:SPTDefaultAuthorizationOption
-                presentingViewController:[UIApplication sharedApplication].keyWindow.rootViewController
-            ];
+            [ self->_sessionManager initiateSessionWithScope:scope options:SPTDefaultAuthorizationOption campaign:NULL];
         });
     }
 }

ios/RNSpotifyRemoteConvert.h

@@ -1,6 +1,6 @@
 
 #import <Foundation/Foundation.h>
-#import <SpotifyiOS.h>
+@import SpotifyiOS;
 #import "RNSpotifyRemoteError.h"
 
 @interface RNSpotifyRemoteConvert : NSObject

ios/RNSpotifyRemoteError.m

@@ -7,7 +7,7 @@
 //
 
 #import "RNSpotifyRemoteError.h"
-#import <SpotifyiOS.h>
+@import SpotifyiOS;
 
 
 @interface RNSpotifyRemoteErrorCode()