Skip to content

Commit 5501b15

Browse files
LisionLision
authored
Merge pull request Lision#20 from Lision/develop
Tried and tested by using swift5
2 parents 28660ad + 1e7271d commit 5501b15

File tree

4 files changed

+44
-11
lines changed

4 files changed

+44
-11
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode10
2+
osx_image: xcode10.2
33
xcode_project: WKWebViewJavascriptBridge.xcodeproj
44
xcode_scheme: WKWebViewJavascriptBridge
55

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The reason for the iOS platform cross-domain access vulnerability is due to UIWe
3434

3535
# Features
3636

37-
- **Swift Support:** Swift 3.2 ~ 4.2 Support.
37+
- **Swift Support:** Swift 3.2 ~ 5 Support.
3838
- **High Performance:** The messaging performance is higher than intercept requests.
3939
- **High Speed:** No need to consider alert box safety timeout.
4040
- **Lightwight:** This framework contains only 3 files.

‎README_ZH-CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ iOS 平台跨域访问漏洞成因是由于 UIWebView 默认开启了WebKitAllow
3434

3535
# 特性
3636

37-
- Swift 的支持：Swift 3.2 ~ 4.2 的支持。
37+
- Swift 的支持：Swift 3.2 ~ 5 的支持。
3838
- 高性能：消息传递性能高于传统实现方式（拦截 Requests）。
3939
- 高速：无需考虑 Alert Box 安全超时。
4040
- 轻量：框架除去自动生成的 `.h` 仅有 3 个文件。

‎WKWebViewJavascriptBridge.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
BC4A38AE20138F7500E96E5D /* WKWebViewJavascriptBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC4A38A420138F7500E96E5D /* WKWebViewJavascriptBridge.framework */; };
1414
BC4A38B320138F7500E96E5D /* WKWebViewJavascriptBridgeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC4A38B220138F7500E96E5D /* WKWebViewJavascriptBridgeTests.swift */; };
1515
BC4A38B520138F7500E96E5D /* WKWebViewJavascriptBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4A38A720138F7500E96E5D /* WKWebViewJavascriptBridge.h */; settings = {ATTRIBUTES = (Public, ); }; };
16-
BC942673201750BA00A5A6F9 /* WKWebViewJavascriptBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC4A38A420138F7500E96E5D /* WKWebViewJavascriptBridge.framework */; };
16+
BC6385C42286E283007C7E5E /* WKWebViewJavascriptBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC4A38A420138F7500E96E5D /* WKWebViewJavascriptBridge.framework */; };
17+
BC6385C52286E283007C7E5E /* WKWebViewJavascriptBridge.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BC4A38A420138F7500E96E5D /* WKWebViewJavascriptBridge.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1718
BC94267420182E8300A5A6F9 /* Demo.html in Resources */ = {isa = PBXBuildFile; fileRef = BC995A582016F6A60012F728 /* Demo.html */; };
1819
BC995A492016F5690012F728 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC995A482016F5690012F728 /* AppDelegate.swift */; };
1920
BC995A4B2016F5690012F728 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC995A4A2016F5690012F728 /* ViewController.swift */; };
@@ -30,8 +31,29 @@
3031
remoteGlobalIDString = BC4A38A320138F7500E96E5D;
3132
remoteInfo = WKWebViewJavascriptBridge;
3233
};
34+
BC6385C62286E283007C7E5E /* PBXContainerItemProxy */ = {
35+
isa = PBXContainerItemProxy;
36+
containerPortal = BC4A389B20138F7500E96E5D /* Project object */;
37+
proxyType = 1;
38+
remoteGlobalIDString = BC4A38A320138F7500E96E5D;
39+
remoteInfo = WKWebViewJavascriptBridge;
40+
};
3341
/* End PBXContainerItemProxy section */
3442

43+
/* Begin PBXCopyFilesBuildPhase section */
44+
BC6385C82286E283007C7E5E /* Embed Frameworks */ = {
45+
isa = PBXCopyFilesBuildPhase;
46+
buildActionMask = 2147483647;
47+
dstPath = "";
48+
dstSubfolderSpec = 10;
49+
files = (
50+
BC6385C52286E283007C7E5E /* WKWebViewJavascriptBridge.framework in Embed Frameworks */,
51+
);
52+
name = "Embed Frameworks";
53+
runOnlyForDeploymentPostprocessing = 0;
54+
};
55+
/* End PBXCopyFilesBuildPhase section */
56+
3557
/* Begin PBXFileReference section */
3658
BC3D0B1B201440BF008B7E77 /* WKWebViewJavascriptBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKWebViewJavascriptBridge.swift; sourceTree = "<group>"; };
3759
BC3D0B1D201440D9008B7E77 /* WKWebViewJavascriptBridgeBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKWebViewJavascriptBridgeBase.swift; sourceTree = "<group>"; };
@@ -72,7 +94,7 @@
7294
isa = PBXFrameworksBuildPhase;
7395
buildActionMask = 2147483647;
7496
files = (
75-
BC942673201750BA00A5A6F9 /* WKWebViewJavascriptBridge.framework in Frameworks */,
97+
BC6385C42286E283007C7E5E /* WKWebViewJavascriptBridge.framework in Frameworks */,
7698
);
7799
runOnlyForDeploymentPostprocessing = 0;
78100
};
@@ -199,10 +221,12 @@
199221
BC995A422016F5690012F728 /* Sources */,
200222
BC995A432016F5690012F728 /* Frameworks */,
201223
BC995A442016F5690012F728 /* Resources */,
224+
BC6385C82286E283007C7E5E /* Embed Frameworks */,
202225
);
203226
buildRules = (
204227
);
205228
dependencies = (
229+
BC6385C72286E283007C7E5E /* PBXTargetDependency */,
206230
);
207231
name = WKWebViewJavascriptBridgeDemo;
208232
productName = WKWebViewJavascriptBridgeDemo;
@@ -319,6 +343,11 @@
319343
target = BC4A38A320138F7500E96E5D /* WKWebViewJavascriptBridge */;
320344
targetProxy = BC4A38AF20138F7500E96E5D /* PBXContainerItemProxy */;
321345
};
346+
BC6385C72286E283007C7E5E /* PBXTargetDependency */ = {
347+
isa = PBXTargetDependency;
348+
target = BC4A38A320138F7500E96E5D /* WKWebViewJavascriptBridge */;
349+
targetProxy = BC6385C62286E283007C7E5E /* PBXContainerItemProxy */;
350+
};
322351
/* End PBXTargetDependency section */
323352

324353
/* Begin PBXVariantGroup section */
@@ -398,6 +427,7 @@
398427
SDKROOT = iphoneos;
399428
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
400429
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
430+
SWIFT_VERSION = 5.0;
401431
VERSIONING_SYSTEM = "apple-generic";
402432
VERSION_INFO_PREFIX = "";
403433
};
@@ -452,6 +482,7 @@
452482
MTL_ENABLE_DEBUG_INFO = NO;
453483
SDKROOT = iphoneos;
454484
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
485+
SWIFT_VERSION = 5.0;
455486
VALIDATE_PRODUCT = YES;
456487
VERSIONING_SYSTEM = "apple-generic";
457488
VERSION_INFO_PREFIX = "";
@@ -477,7 +508,7 @@
477508
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
478509
SKIP_INSTALL = YES;
479510
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
480-
SWIFT_VERSION = 4.2;
511+
SWIFT_VERSION = 5.0;
481512
TARGETED_DEVICE_FAMILY = "1,2";
482513
};
483514
name = Debug;
@@ -500,7 +531,7 @@
500531
PRODUCT_BUNDLE_IDENTIFIER = com.Lision.WKWebViewJavascriptBridge;
501532
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
502533
SKIP_INSTALL = YES;
503-
SWIFT_VERSION = 4.2;
534+
SWIFT_VERSION = 5.0;
504535
TARGETED_DEVICE_FAMILY = "1,2";
505536
};
506537
name = Release;
@@ -515,7 +546,7 @@
515546
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
516547
PRODUCT_BUNDLE_IDENTIFIER = com.Lision.WKWebViewJavascriptBridgeTests;
517548
PRODUCT_NAME = "$(TARGET_NAME)";
518-
SWIFT_VERSION = 4.0;
549+
SWIFT_VERSION = 5.0;
519550
TARGETED_DEVICE_FAMILY = "1,2";
520551
};
521552
name = Debug;
@@ -530,14 +561,15 @@
530561
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
531562
PRODUCT_BUNDLE_IDENTIFIER = com.Lision.WKWebViewJavascriptBridgeTests;
532563
PRODUCT_NAME = "$(TARGET_NAME)";
533-
SWIFT_VERSION = 4.0;
564+
SWIFT_VERSION = 5.0;
534565
TARGETED_DEVICE_FAMILY = "1,2";
535566
};
536567
name = Release;
537568
};
538569
BC995A552016F5690012F728 /* Debug */ = {
539570
isa = XCBuildConfiguration;
540571
buildSettings = {
572+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
541573
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
542574
CODE_SIGN_STYLE = Automatic;
543575
DEVELOPMENT_TEAM = ACXP2JHJKF;
@@ -546,14 +578,15 @@
546578
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
547579
PRODUCT_BUNDLE_IDENTIFIER = com.Lision.WKWebViewJavascriptBridgeDemo;
548580
PRODUCT_NAME = "$(TARGET_NAME)";
549-
SWIFT_VERSION = 4.2;
581+
SWIFT_VERSION = 5.0;
550582
TARGETED_DEVICE_FAMILY = "1,2";
551583
};
552584
name = Debug;
553585
};
554586
BC995A562016F5690012F728 /* Release */ = {
555587
isa = XCBuildConfiguration;
556588
buildSettings = {
589+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
557590
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
558591
CODE_SIGN_STYLE = Automatic;
559592
DEVELOPMENT_TEAM = ACXP2JHJKF;
@@ -562,7 +595,7 @@
562595
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
563596
PRODUCT_BUNDLE_IDENTIFIER = com.Lision.WKWebViewJavascriptBridgeDemo;
564597
PRODUCT_NAME = "$(TARGET_NAME)";
565-
SWIFT_VERSION = 4.2;
598+
SWIFT_VERSION = 5.0;
566599
TARGETED_DEVICE_FAMILY = "1,2";
567600
};
568601
name = Release;

0 commit comments

Comments
 (0)