From 75af738d2e6fdfc0c9f0b8d1fa7d568c3a01411b Mon Sep 17 00:00:00 2001 From: Amir Abbas Date: Wed, 5 Apr 2017 02:05:28 +0430 Subject: [PATCH] Made SessionDelegate init public, fixed pod issue --- .travis.yml | 2 +- FileProvider.podspec | 2 +- Sources/DropboxFileProvider.swift | 2 +- Sources/FTPFileProvider.swift | 2 +- Sources/OneDriveFileProvider.swift | 2 +- Sources/RemoteSession.swift | 4 ++-- Sources/WebDAVFileProvider.swift | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c33ceb9..2dab44a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ script: after_success: # Run `pod trunk push` if specified - if [ $POD == "YES" ] && [ -n "$TRAVIS_TAG" ]; then - pod trunk push; + pod trunk push --allow-warnings; fi # - bash <(curl -s https://codecov.io/bash) diff --git a/FileProvider.podspec b/FileProvider.podspec index fb4e3f1..0ca21ad 100644 --- a/FileProvider.podspec +++ b/FileProvider.podspec @@ -58,7 +58,7 @@ Pod::Spec.new do |s| s.author = { "Amir Abbas Mousavian" => "a.mosavian@gmail.com" } # Or just: s.author = "Amir Abbas Mousavian" # s.authors = { "Amir Abbas Mousavian" => "a.mosavian@gmail.com" } - s.social_media_url = "https://twitter.com/amosavian" + # s.social_media_url = "https://twitter.com/amosavian" # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― # # diff --git a/Sources/DropboxFileProvider.swift b/Sources/DropboxFileProvider.swift index 27b2227..62eda20 100644 --- a/Sources/DropboxFileProvider.swift +++ b/Sources/DropboxFileProvider.swift @@ -48,7 +48,7 @@ open class DropboxFileProvider: FileProviderBasicRemote { public var session: URLSession { get { if _session == nil { - self.sessionDelegate = SessionDelegate(fileProvider: self, credential: credential) + self.sessionDelegate = SessionDelegate(fileProvider: self) let config = URLSessionConfiguration.default config.urlCache = cache config.requestCachePolicy = .returnCacheDataElseLoad diff --git a/Sources/FTPFileProvider.swift b/Sources/FTPFileProvider.swift index e5895cf..4248976 100644 --- a/Sources/FTPFileProvider.swift +++ b/Sources/FTPFileProvider.swift @@ -47,7 +47,7 @@ open class FTPFileProvider: FileProviderBasicRemote { public var session: URLSession { get { if _session == nil { - self.sessionDelegate = SessionDelegate(fileProvider: self, credential: credential) + self.sessionDelegate = SessionDelegate(fileProvider: self) let config = URLSessionConfiguration.default config.urlCache = cache config.requestCachePolicy = .returnCacheDataElseLoad diff --git a/Sources/OneDriveFileProvider.swift b/Sources/OneDriveFileProvider.swift index c2e4c64..1302407 100644 --- a/Sources/OneDriveFileProvider.swift +++ b/Sources/OneDriveFileProvider.swift @@ -47,7 +47,7 @@ open class OneDriveFileProvider: FileProviderBasicRemote { public var session: URLSession { get { if _session == nil { - self.sessionDelegate = SessionDelegate(fileProvider: self, credential: credential) + self.sessionDelegate = SessionDelegate(fileProvider: self) let queue = OperationQueue() //queue.underlyingQueue = dispatch_queue let config = URLSessionConfiguration.default diff --git a/Sources/RemoteSession.swift b/Sources/RemoteSession.swift index bda0e12..d586147 100644 --- a/Sources/RemoteSession.swift +++ b/Sources/RemoteSession.swift @@ -121,9 +121,9 @@ final public class SessionDelegate: NSObject, URLSessionDataDelegate, URLSession /// Forwardng URLSessionStreamTaskDelegate call public var didBecomeStream :((_ session: URLSession, _ taskId: Int, _ didBecome: InputStream, _ outputStream: OutputStream) -> Void)? - init(fileProvider: FileProviderBasicRemote & FileProviderOperations, credential: URLCredential?) { + public init(fileProvider: FileProviderBasicRemote & FileProviderOperations) { self.fileProvider = fileProvider - self.credential = credential + self.credential = fileProvider.credential } // codebeat:disable[ARITY] diff --git a/Sources/WebDAVFileProvider.swift b/Sources/WebDAVFileProvider.swift index fc95af5..a2009e4 100644 --- a/Sources/WebDAVFileProvider.swift +++ b/Sources/WebDAVFileProvider.swift @@ -46,7 +46,7 @@ open class WebDAVFileProvider: FileProviderBasicRemote { public var session: URLSession { get { if _session == nil { - self.sessionDelegate = SessionDelegate(fileProvider: self, credential: credential) + self.sessionDelegate = SessionDelegate(fileProvider: self) let queue = OperationQueue() //queue.underlyingQueue = dispatch_queue let config = URLSessionConfiguration.default