From 08e9334fdec7909cb80ea44d375bb75ab0542c21 Mon Sep 17 00:00:00 2001 From: phimage Date: Sun, 17 Sep 2017 21:40:06 +0200 Subject: [PATCH] Update podspec to 2.0.0 --- CallbackURLKit.podspec | 2 +- CallbackURLKit.xcodeproj/project.pbxproj | 23 +++++++++++++++++++++-- Clients/GoogleChrome.swift | 2 +- Sources/Manager.swift | 7 +++++-- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/CallbackURLKit.podspec b/CallbackURLKit.podspec index 4c27269..12fdea2 100644 --- a/CallbackURLKit.podspec +++ b/CallbackURLKit.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "CallbackURLKit" - s.version = "1.2.0" + s.version = "2.0.0" s.summary = "Implemenation of x-callback-url in swift" s.homepage = "https://github.com/phimage/CallbackURLKit" diff --git a/CallbackURLKit.xcodeproj/project.pbxproj b/CallbackURLKit.xcodeproj/project.pbxproj index 1b6eba4..9b06bb3 100644 --- a/CallbackURLKit.xcodeproj/project.pbxproj +++ b/CallbackURLKit.xcodeproj/project.pbxproj @@ -25,6 +25,16 @@ C4E32D5E1C398AE5005CD033 /* GoogleChrome.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E32D4F1C398AAC005CD033 /* GoogleChrome.swift */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + C445365D1F6F05E20006FFC4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C4A8D5071C37D84A00DB3306 /* Project object */; + proxyType = 1; + remoteGlobalIDString = C4A8D50F1C37D84A00DB3306; + remoteInfo = CallbackURLKit; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 48D0A1491F0E28CE0019B815 /* Ulysses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Ulysses.swift; path = Clients/Ulysses.swift; sourceTree = ""; }; C418B1DA1C386C160097FDD9 /* CallbackURLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CallbackURLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -218,6 +228,7 @@ buildRules = ( ); dependencies = ( + C445365E1F6F05E20006FFC4 /* PBXTargetDependency */, ); name = CallbackURLKitClients; productName = CallbackURLKitClients; @@ -324,6 +335,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + C445365E1F6F05E20006FFC4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C4A8D50F1C37D84A00DB3306 /* CallbackURLKit */; + targetProxy = C445365D1F6F05E20006FFC4 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ C418B1E01C386C160097FDD9 /* Debug */ = { isa = XCBuildConfiguration; @@ -338,7 +357,7 @@ INFOPLIST_FILE = CallbackURLKitOSX/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitOSX; PRODUCT_NAME = CallbackURLKit; SDKROOT = macosx; @@ -361,7 +380,7 @@ INFOPLIST_FILE = CallbackURLKitOSX/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitOSX; PRODUCT_NAME = CallbackURLKit; SDKROOT = macosx; diff --git a/Clients/GoogleChrome.swift b/Clients/GoogleChrome.swift index ee07e7b..94ef8cd 100644 --- a/Clients/GoogleChrome.swift +++ b/Clients/GoogleChrome.swift @@ -45,7 +45,7 @@ public class GoogleChrome: Client { */ public func checkInstalled() { if !self.appInstalled, let url = GoogleChrome.DownloadURL { - Manager.shared.open(url: url) + Manager.open(url: url) } } diff --git a/Sources/Manager.swift b/Sources/Manager.swift index 9d45f7c..f7ebe9a 100644 --- a/Sources/Manager.swift +++ b/Sources/Manager.swift @@ -38,7 +38,7 @@ open class Manager { var actions: [Action: ActionHandler] = [:] /// keep request for callback var requests: [RequestID: Request] = [:] -pecify an URL scheme for callback + open var callbackURLScheme: String? #if APP_EXTENSIONS @@ -240,7 +240,10 @@ pecify an URL scheme for callback return result } - + open static func open(url: Foundation.URL) { + Manager.shared.open(url: url) + } + open func open(url: Foundation.URL) { #if APP_EXTENSIONS if let extensionContext = extensionContext {