Skip to content

Commit 8ad2ec3

Browse files
phimagephimage
committed
Convert to swift 3.0
1 parent df27538 commit 8ad2ec3

File tree

11 files changed

+217
-168
lines changed

11 files changed

+217
-168
lines changed

‎CallbackURLKit.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
44
s.name = "CallbackURLKit"
5-
s.version = "0.2.0"
5+
s.version = "1.0.0"
66
s.summary = "Implemenation of x-callback-url in swift"
77
s.homepage = "https://github.com/phimage/CallbackURLKit"
88

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
2525
s.default_subspecs = 'Core'
2626

2727
s.subspec "Core" do |sp|
28-
sp.source_files = "CallbackURLKit/*.swift"
28+
sp.source_files = "Sources/*.swift"
2929
end
3030

3131
s.subspec "GoogleChrome" do |sp|

‎CallbackURLKit.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,34 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
C418B1D41C3860190097FDD9 /* CallbackURLKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C418B1D31C3860190097FDD9 /* CallbackURLKit.swift */; };
1110
C418B1DD1C386C160097FDD9 /* CallbackURLKitOSX.h in Headers */ = {isa = PBXBuildFile; fileRef = C418B1DC1C386C160097FDD9 /* CallbackURLKitOSX.h */; settings = {ATTRIBUTES = (Public, ); }; };
12-
C418B1E21C386C1E0097FDD9 /* CallbackURLKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C418B1D31C3860190097FDD9 /* CallbackURLKit.swift */; };
13-
C418B1E31C386C1E0097FDD9 /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8D51D1C37E11F00DB3306 /* Manager.swift */; };
14-
C418B1E41C386C1E0097FDD9 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8D51B1C37DF0900DB3306 /* Client.swift */; };
15-
C418B1E51C386C1E0097FDD9 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8D51F1C380F5100DB3306 /* Request.swift */; };
16-
C418B1E61C386C1E0097FDD9 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8D5211C380F6B00DB3306 /* Extensions.swift */; };
1711
C4A8D5141C37D84A00DB3306 /* CallbackURLKit.h in Headers */ = {isa = PBXBuildFile; fileRef = C4A8D5131C37D84A00DB3306 /* CallbackURLKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
18-
C4A8D51C1C37DF0900DB3306 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8D51B1C37DF0900DB3306 /* Client.swift */; };
19-
C4A8D51E1C37E11F00DB3306 /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8D51D1C37E11F00DB3306 /* Manager.swift */; };
20-
C4A8D5201C380F5100DB3306 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8D51F1C380F5100DB3306 /* Request.swift */; };
21-
C4A8D5221C380F6B00DB3306 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8D5211C380F6B00DB3306 /* Extensions.swift */; };
12+
C4DB1E311D8421DE008DD3FB /* CallbackURLKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E2C1D8421DE008DD3FB /* CallbackURLKit.swift */; };
13+
C4DB1E321D8421DE008DD3FB /* CallbackURLKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E2C1D8421DE008DD3FB /* CallbackURLKit.swift */; };
14+
C4DB1E331D8421DE008DD3FB /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E2D1D8421DE008DD3FB /* Client.swift */; };
15+
C4DB1E341D8421DE008DD3FB /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E2D1D8421DE008DD3FB /* Client.swift */; };
16+
C4DB1E351D8421DE008DD3FB /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E2E1D8421DE008DD3FB /* Extensions.swift */; };
17+
C4DB1E361D8421DE008DD3FB /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E2E1D8421DE008DD3FB /* Extensions.swift */; };
18+
C4DB1E371D8421DE008DD3FB /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E2F1D8421DE008DD3FB /* Manager.swift */; };
19+
C4DB1E381D8421DE008DD3FB /* Manager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E2F1D8421DE008DD3FB /* Manager.swift */; };
20+
C4DB1E391D8421DE008DD3FB /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E301D8421DE008DD3FB /* Request.swift */; };
21+
C4DB1E3A1D8421DE008DD3FB /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DB1E301D8421DE008DD3FB /* Request.swift */; };
2222
C4E32D591C398AE1005CD033 /* CallbackURLKitClients.h in Headers */ = {isa = PBXBuildFile; fileRef = C4E32D581C398AE1005CD033 /* CallbackURLKitClients.h */; settings = {ATTRIBUTES = (Public, ); }; };
2323
C4E32D5E1C398AE5005CD033 /* GoogleChrome.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4E32D4F1C398AAC005CD033 /* GoogleChrome.swift */; };
2424
/* End PBXBuildFile section */
2525

2626
/* Begin PBXFileReference section */
27-
C418B1D31C3860190097FDD9 /* CallbackURLKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallbackURLKit.swift; sourceTree = "<group>"; };
2827
C418B1DA1C386C160097FDD9 /* CallbackURLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CallbackURLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2928
C418B1DC1C386C160097FDD9 /* CallbackURLKitOSX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CallbackURLKitOSX.h; sourceTree = "<group>"; };
3029
C418B1DE1C386C160097FDD9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3130
C4A8D5101C37D84A00DB3306 /* CallbackURLKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CallbackURLKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3231
C4A8D5131C37D84A00DB3306 /* CallbackURLKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CallbackURLKit.h; sourceTree = "<group>"; };
3332
C4A8D5151C37D84A00DB3306 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
34-
C4A8D51B1C37DF0900DB3306 /* Client.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
35-
C4A8D51D1C37E11F00DB3306 /* Manager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Manager.swift; sourceTree = "<group>"; };
36-
C4A8D51F1C380F5100DB3306 /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
37-
C4A8D5211C380F6B00DB3306 /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
33+
C4DB1E2C1D8421DE008DD3FB /* CallbackURLKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallbackURLKit.swift; sourceTree = "<group>"; };
34+
C4DB1E2D1D8421DE008DD3FB /* Client.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
35+
C4DB1E2E1D8421DE008DD3FB /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
36+
C4DB1E2F1D8421DE008DD3FB /* Manager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Manager.swift; sourceTree = "<group>"; };
37+
C4DB1E301D8421DE008DD3FB /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
3838
C4E32D4F1C398AAC005CD033 /* GoogleChrome.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = GoogleChrome.swift; path = Clients/GoogleChrome.swift; sourceTree = "<group>"; };
3939
C4E32D561C398AE1005CD033 /* CallbackURLKitClients.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CallbackURLKitClients.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4040
C4E32D581C398AE1005CD033 /* CallbackURLKitClients.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CallbackURLKitClients.h; sourceTree = "<group>"; };
@@ -78,6 +78,7 @@
7878
C4A8D5061C37D84A00DB3306 = {
7979
isa = PBXGroup;
8080
children = (
81+
C4DB1E2B1D8421DE008DD3FB /* Sources */,
8182
C4A8D5121C37D84A00DB3306 /* CallbackURLKit */,
8283
C418B1DB1C386C160097FDD9 /* CallbackURLKitOSX */,
8384
C4E32D501C398AAE005CD033 /* Clients */,
@@ -99,17 +100,24 @@
99100
C4A8D5121C37D84A00DB3306 /* CallbackURLKit */ = {
100101
isa = PBXGroup;
101102
children = (
102-
C418B1D31C3860190097FDD9 /* CallbackURLKit.swift */,
103-
C4A8D51D1C37E11F00DB3306 /* Manager.swift */,
104-
C4A8D51B1C37DF0900DB3306 /* Client.swift */,
105-
C4A8D51F1C380F5100DB3306 /* Request.swift */,
106-
C4A8D5211C380F6B00DB3306 /* Extensions.swift */,
107103
C4A8D5131C37D84A00DB3306 /* CallbackURLKit.h */,
108104
C4A8D5151C37D84A00DB3306 /* Info.plist */,
109105
);
110106
path = CallbackURLKit;
111107
sourceTree = "<group>";
112108
};
109+
C4DB1E2B1D8421DE008DD3FB /* Sources */ = {
110+
isa = PBXGroup;
111+
children = (
112+
C4DB1E2C1D8421DE008DD3FB /* CallbackURLKit.swift */,
113+
C4DB1E2D1D8421DE008DD3FB /* Client.swift */,
114+
C4DB1E2E1D8421DE008DD3FB /* Extensions.swift */,
115+
C4DB1E2F1D8421DE008DD3FB /* Manager.swift */,
116+
C4DB1E301D8421DE008DD3FB /* Request.swift */,
117+
);
118+
path = Sources;
119+
sourceTree = "<group>";
120+
};
113121
C4E32D501C398AAE005CD033 /* Clients */ = {
114122
isa = PBXGroup;
115123
children = (
@@ -217,14 +225,15 @@
217225
C4A8D5071C37D84A00DB3306 /* Project object */ = {
218226
isa = PBXProject;
219227
attributes = {
220-
LastUpgradeCheck = 0720;
228+
LastUpgradeCheck = 0800;
221229
ORGANIZATIONNAME = phimage;
222230
TargetAttributes = {
223231
C418B1D91C386C160097FDD9 = {
224232
CreatedOnToolsVersion = 7.2;
225233
};
226234
C4A8D50F1C37D84A00DB3306 = {
227235
CreatedOnToolsVersion = 7.2;
236+
LastSwiftMigration = 0800;
228237
};
229238
C4E32D551C398AE1005CD033 = {
230239
CreatedOnToolsVersion = 7.2;
@@ -279,23 +288,23 @@
279288
isa = PBXSourcesBuildPhase;
280289
buildActionMask = 2147483647;
281290
files = (
282-
C418B1E61C386C1E0097FDD9 /* Extensions.swift in Sources */,
283-
C418B1E21C386C1E0097FDD9 /* CallbackURLKit.swift in Sources */,
284-
C418B1E51C386C1E0097FDD9 /* Request.swift in Sources */,
285-
C418B1E31C386C1E0097FDD9 /* Manager.swift in Sources */,
286-
C418B1E41C386C1E0097FDD9 /* Client.swift in Sources */,
291+
C4DB1E341D8421DE008DD3FB /* Client.swift in Sources */,
292+
C4DB1E361D8421DE008DD3FB /* Extensions.swift in Sources */,
293+
C4DB1E3A1D8421DE008DD3FB /* Request.swift in Sources */,
294+
C4DB1E321D8421DE008DD3FB /* CallbackURLKit.swift in Sources */,
295+
C4DB1E381D8421DE008DD3FB /* Manager.swift in Sources */,
287296
);
288297
runOnlyForDeploymentPostprocessing = 0;
289298
};
290299
C4A8D50B1C37D84A00DB3306 /* Sources */ = {
291300
isa = PBXSourcesBuildPhase;
292301
buildActionMask = 2147483647;
293302
files = (
294-
C4A8D51C1C37DF0900DB3306 /* Client.swift in Sources */,
295-
C4A8D5221C380F6B00DB3306 /* Extensions.swift in Sources */,
296-
C4A8D5201C380F5100DB3306 /* Request.swift in Sources */,
297-
C4A8D51E1C37E11F00DB3306 /* Manager.swift in Sources */,
298-
C418B1D41C3860190097FDD9 /* CallbackURLKit.swift in Sources */,
303+
C4DB1E331D8421DE008DD3FB /* Client.swift in Sources */,
304+
C4DB1E351D8421DE008DD3FB /* Extensions.swift in Sources */,
305+
C4DB1E391D8421DE008DD3FB /* Request.swift in Sources */,
306+
C4DB1E311D8421DE008DD3FB /* CallbackURLKit.swift in Sources */,
307+
C4DB1E371D8421DE008DD3FB /* Manager.swift in Sources */,
299308
);
300309
runOnlyForDeploymentPostprocessing = 0;
301310
};
@@ -313,7 +322,7 @@
313322
C418B1E01C386C160097FDD9 /* Debug */ = {
314323
isa = XCBuildConfiguration;
315324
buildSettings = {
316-
CODE_SIGN_IDENTITY = "-";
325+
CODE_SIGN_IDENTITY = "";
317326
COMBINE_HIDPI_IMAGES = YES;
318327
DEFINES_MODULE = YES;
319328
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -328,13 +337,14 @@
328337
PRODUCT_NAME = CallbackURLKit;
329338
SDKROOT = macosx;
330339
SKIP_INSTALL = YES;
340+
SWIFT_VERSION = 3.0;
331341
};
332342
name = Debug;
333343
};
334344
C418B1E11C386C160097FDD9 /* Release */ = {
335345
isa = XCBuildConfiguration;
336346
buildSettings = {
337-
CODE_SIGN_IDENTITY = "-";
347+
CODE_SIGN_IDENTITY = "";
338348
COMBINE_HIDPI_IMAGES = YES;
339349
DEFINES_MODULE = YES;
340350
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -349,6 +359,7 @@
349359
PRODUCT_NAME = CallbackURLKit;
350360
SDKROOT = macosx;
351361
SKIP_INSTALL = YES;
362+
SWIFT_VERSION = 3.0;
352363
};
353364
name = Release;
354365
};
@@ -365,8 +376,10 @@
365376
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
366377
CLANG_WARN_EMPTY_BODY = YES;
367378
CLANG_WARN_ENUM_CONVERSION = YES;
379+
CLANG_WARN_INFINITE_RECURSION = YES;
368380
CLANG_WARN_INT_CONVERSION = YES;
369381
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
382+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
370383
CLANG_WARN_UNREACHABLE_CODE = YES;
371384
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
372385
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -413,8 +426,10 @@
413426
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
414427
CLANG_WARN_EMPTY_BODY = YES;
415428
CLANG_WARN_ENUM_CONVERSION = YES;
429+
CLANG_WARN_INFINITE_RECURSION = YES;
416430
CLANG_WARN_INT_CONVERSION = YES;
417431
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
432+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
418433
CLANG_WARN_UNREACHABLE_CODE = YES;
419434
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
420435
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -434,6 +449,7 @@
434449
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
435450
MTL_ENABLE_DEBUG_INFO = NO;
436451
SDKROOT = iphoneos;
452+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
437453
TARGETED_DEVICE_FAMILY = "1,2";
438454
VALIDATE_PRODUCT = YES;
439455
VERSIONING_SYSTEM = "apple-generic";
@@ -445,6 +461,7 @@
445461
isa = XCBuildConfiguration;
446462
buildSettings = {
447463
CLANG_ENABLE_MODULES = YES;
464+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
448465
DEFINES_MODULE = YES;
449466
DYLIB_COMPATIBILITY_VERSION = 1;
450467
DYLIB_CURRENT_VERSION = 1;
@@ -456,13 +473,15 @@
456473
PRODUCT_NAME = "$(TARGET_NAME)";
457474
SKIP_INSTALL = YES;
458475
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
476+
SWIFT_VERSION = 3.0;
459477
};
460478
name = Debug;
461479
};
462480
C4A8D51A1C37D84A00DB3306 /* Release */ = {
463481
isa = XCBuildConfiguration;
464482
buildSettings = {
465483
CLANG_ENABLE_MODULES = YES;
484+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
466485
DEFINES_MODULE = YES;
467486
DYLIB_COMPATIBILITY_VERSION = 1;
468487
DYLIB_CURRENT_VERSION = 1;
@@ -473,12 +492,14 @@
473492
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKit;
474493
PRODUCT_NAME = "$(TARGET_NAME)";
475494
SKIP_INSTALL = YES;
495+
SWIFT_VERSION = 3.0;
476496
};
477497
name = Release;
478498
};
479499
C4E32D5C1C398AE1005CD033 /* Debug */ = {
480500
isa = XCBuildConfiguration;
481501
buildSettings = {
502+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
482503
DEFINES_MODULE = YES;
483504
DYLIB_COMPATIBILITY_VERSION = 1;
484505
DYLIB_CURRENT_VERSION = 1;
@@ -489,12 +510,14 @@
489510
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitClients;
490511
PRODUCT_NAME = "$(TARGET_NAME)";
491512
SKIP_INSTALL = YES;
513+
SWIFT_VERSION = 3.0;
492514
};
493515
name = Debug;
494516
};
495517
C4E32D5D1C398AE1005CD033 /* Release */ = {
496518
isa = XCBuildConfiguration;
497519
buildSettings = {
520+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
498521
DEFINES_MODULE = YES;
499522
DYLIB_COMPATIBILITY_VERSION = 1;
500523
DYLIB_CURRENT_VERSION = 1;
@@ -505,6 +528,7 @@
505528
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitClients;
506529
PRODUCT_NAME = "$(TARGET_NAME)";
507530
SKIP_INSTALL = YES;
531+
SWIFT_VERSION = 3.0;
508532
};
509533
name = Release;
510534
};
@@ -545,6 +569,7 @@
545569
C4E32D5D1C398AE1005CD033 /* Release */,
546570
);
547571
defaultConfigurationIsVisible = 0;
572+
defaultConfigurationName = Release;
548573
};
549574
/* End XCConfigurationList section */
550575
};

‎CallbackURLKit.xcodeproj/xcshareddata/xcschemes/CallbackURLKit.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CallbackURLKit.xcodeproj/xcshareddata/xcschemes/CallbackURLKitOSX.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Clients/GoogleChrome.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// CallbackURLKit
44
/*
55
The MIT License (MIT)
6-
Copyright (c) 2015 Eric Marchand (phimage)
6+
Copyright (c) 2016 Eric Marchand (phimage)
77
Permission is hereby granted, free of charge, to any person obtaining a copy
88
of this software and associated documentation files (the "Software"), to deal
99
in the Software without restriction, including without limitation the rights
@@ -25,17 +25,17 @@ SOFTWARE.
2525
public class GoogleChrome: Client {
2626

2727
public init() {
28-
super.init(URLScheme: "googlechrome-x-callback")
28+
super.init(urlScheme: "googlechrome-x-callback")
2929
}
3030

31-
public func openURL(url: String, newTab: Bool = false,
31+
public func open(url: String, newTab: Bool = false,
3232
onSuccess: SuccessCallback? = nil, onFailure: FailureCallback? = nil, onCancel: CancelCallback? = nil) throws {
3333
var parameters = ["url": url]
3434
if newTab {
3535
parameters = ["create-new-tab": ""]
3636
}
37-
try self.performAction("open", parameters: parameters,
37+
try self.perform(action: "open", parameters: parameters,
3838
onSuccess: onSuccess, onFailure: onFailure, onCancel: onCancel)
3939
}
4040

41-
}
41+
}

‎Package.swift‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Package.swift
2+
/*
3+
The MIT License (MIT)
4+
Copyright (c) 2015-2016 Perceval Faramaz
5+
Copyright (c) 2016 Eric Marchand (phimage)
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
SOFTWARE.
21+
*/
22+
23+
import PackageDescription
24+
25+
let package = Package(
26+
name: "CallbackURLKit"
27+
)

0 commit comments

Comments
 (0)