diff --git a/RNSpotifyRemote.podspec b/RNSpotifyRemote.podspec index 4ac5f28..f5f42d9 100644 --- a/RNSpotifyRemote.podspec +++ b/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' diff --git a/ios/RNSpotifyItem.h b/ios/RNSpotifyItem.h index ef45c71..e5652b1 100644 --- a/ios/RNSpotifyItem.h +++ b/ios/RNSpotifyItem.h @@ -6,7 +6,7 @@ // Copyright © 2018 Facebook. All rights reserved. // -#import +@import SpotifyiOS; #ifndef RNSpotifyItem_h #define RNSpotifyItem_h diff --git a/ios/RNSpotifyRemoteAppRemote.m b/ios/RNSpotifyRemoteAppRemote.m index 765ccdb..d22607d 100644 --- a/ios/RNSpotifyRemoteAppRemote.m +++ b/ios/RNSpotifyRemoteAppRemote.m @@ -2,7 +2,7 @@ #import "RNSpotifyRemoteAppRemote.h" #import #import -#import +@import SpotifyiOS; #import "RNSpotifyRemoteConvert.h" #import "RNSpotifyItem.h" #import "RNSpotifyRemoteError.h" diff --git a/ios/RNSpotifyRemoteAuth.m b/ios/RNSpotifyRemoteAuth.m index 4039277..21b3f26 100644 --- a/ios/RNSpotifyRemoteAuth.m +++ b/ios/RNSpotifyRemoteAuth.m @@ -2,7 +2,7 @@ #import "RNSpotifyRemoteAuth.h" #import #import -#import +@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]; }); } } diff --git a/ios/RNSpotifyRemoteConvert.h b/ios/RNSpotifyRemoteConvert.h index 678570f..0eef339 100644 --- a/ios/RNSpotifyRemoteConvert.h +++ b/ios/RNSpotifyRemoteConvert.h @@ -1,6 +1,6 @@ #import -#import +@import SpotifyiOS; #import "RNSpotifyRemoteError.h" @interface RNSpotifyRemoteConvert : NSObject diff --git a/ios/RNSpotifyRemoteError.m b/ios/RNSpotifyRemoteError.m index 87028af..1957713 100644 --- a/ios/RNSpotifyRemoteError.m +++ b/ios/RNSpotifyRemoteError.m @@ -7,7 +7,7 @@ // #import "RNSpotifyRemoteError.h" -#import +@import SpotifyiOS; @interface RNSpotifyRemoteErrorCode() diff --git a/ios/external/SpotifySDK b/ios/external/SpotifySDK index f9a7d53..5bd49e2 160000 --- a/ios/external/SpotifySDK +++ b/ios/external/SpotifySDK @@ -1 +1 @@ -Subproject commit f9a7d53967de5ea633845c2387b7fc8f90b96265 +Subproject commit 5bd49e227145dee4871b1667bf81a2b896590176