Skip to content

Commit

Permalink
Update for compatibility with Swift5
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanlu813 committed Apr 23, 2019
1 parent 0e32a3b commit e8656a0
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion ABSDKCoreKit/ABSDKWebSocketTransport.swift
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public class ABSDKWebSocketTransport: NetworkTransport {
if let params = self.params {
request.allHTTPHeaderFields = params
}
self.socket = Socket(url: url, params: params)
self.socket = Socket(url.absoluteString, params: params)

self.socket?.onOpen { [weak self] in
self?.websocketDidConnect()
Expand Down
16 changes: 8 additions & 8 deletions ArcBlockSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -1219,7 +1219,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand Down Expand Up @@ -1455,7 +1455,7 @@
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "ABSDKAccountKitTests/ABSDKAccountKitTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -1523,7 +1523,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "ABSDKAccountKitTests/ABSDKAccountKitTests-Bridging-Header.h";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand Down Expand Up @@ -1759,7 +1759,7 @@
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "ABSDKMessagingKitTests/ABSDKMessagingKitTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -1827,7 +1827,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "ABSDKMessagingKitTests/ABSDKMessagingKitTests-Bridging-Header.h";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand Down Expand Up @@ -2063,7 +2063,7 @@
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "ABSDKWalletKitTests/ABSDKWalletKitTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -2131,7 +2131,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = "ABSDKWalletKitTests/ABSDKWalletKitTests-Bridging-Header.h";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "ArcBlock/apollo-ios"
github "stephencelis/SQLite.swift"
github "ashleymills/Reachability.swift"
github "davidstump/SwiftPhoenixClient" ~> 0.9
github "davidstump/SwiftPhoenixClient"
github "krzyzanowskim/CryptoSwift"
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Quick" ~> 1.2
github "Quick/Nimble" ~> 7.0.2
github "Quick/Quick"
github "Quick/Nimble"
14 changes: 7 additions & 7 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github "ArcBlock/apollo-ios" "0.9.3"
github "Quick/Nimble" "v7.3.1"
github "Quick/Quick" "v1.3.2"
github "ashleymills/Reachability.swift" "v4.3.0"
github "ArcBlock/apollo-ios" "0.9.4"
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.1.0"
github "ashleymills/Reachability.swift" "v4.3.1"
github "daltoniam/Starscream" "3.0.6"
github "davidstump/SwiftPhoenixClient" "0.9.2"
github "krzyzanowskim/CryptoSwift" "0.13.0"
github "stephencelis/SQLite.swift" "0.11.5"
github "davidstump/SwiftPhoenixClient" "1.0.1"
github "krzyzanowskim/CryptoSwift" "1.0.0"
github "stephencelis/SQLite.swift" "0.11.6"

0 comments on commit e8656a0

Please sign in to comment.