Skip to content

Commit 5f2ca1d

Browse files
authored
Merge pull request #2 from panupat/feat/remove-UIWebView
remove UIWebView + set deployment target to iOS 11.0
2 parents 18d3de3 + 643f516 commit 5f2ca1d

File tree

6 files changed

+8
-435
lines changed

6 files changed

+8
-435
lines changed

Example Apps/ExampleApp-iOS.xcodeproj/project.pbxproj

+3-16
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
0E8082DB19EDC32300479452 /* WKWebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E8082DA19EDC32300479452 /* WKWebViewJavascriptBridge.m */; };
1313
0ECB01441A0EE1F20037FF4E /* ExampleWKWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ECB01431A0EE1F20037FF4E /* ExampleWKWebViewController.m */; };
1414
2C1562B5176B9F8400B4AE50 /* WebViewJavascriptBridge.js.txt in Resources */ = {isa = PBXBuildFile; fileRef = 2C1562B4176B9F8400B4AE50 /* WebViewJavascriptBridge.js.txt */; };
15-
2C1562C0176BA63500B4AE50 /* WebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C1562A9176B9F6200B4AE50 /* WebViewJavascriptBridge.m */; };
16-
2C45CA2C1884AD520002A4E2 /* ExampleUIWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C45CA2B1884AD520002A4E2 /* ExampleUIWebViewController.m */; };
1715
2CA045BF17117439006DEE8B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2CA045B717117439006DEE8B /* InfoPlist.strings */; };
1816
2CA045C217117439006DEE8B /* ExampleAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CA045BD17117439006DEE8B /* ExampleAppDelegate.m */; };
1917
2CA045C317117439006DEE8B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CA045BE17117439006DEE8B /* main.m */; };
@@ -32,11 +30,7 @@
3230
0E8082DC19EDD98700479452 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
3331
0ECB01421A0EE1BA0037FF4E /* ExampleWKWebViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExampleWKWebViewController.h; sourceTree = "<group>"; };
3432
0ECB01431A0EE1F20037FF4E /* ExampleWKWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExampleWKWebViewController.m; sourceTree = "<group>"; };
35-
2C1562A8176B9F6200B4AE50 /* WebViewJavascriptBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridge.h; sourceTree = "<group>"; };
36-
2C1562A9176B9F6200B4AE50 /* WebViewJavascriptBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridge.m; sourceTree = "<group>"; };
3733
2C1562B4176B9F8400B4AE50 /* WebViewJavascriptBridge.js.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebViewJavascriptBridge.js.txt; sourceTree = "<group>"; };
38-
2C45CA2A1884AD520002A4E2 /* ExampleUIWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExampleUIWebViewController.h; sourceTree = "<group>"; };
39-
2C45CA2B1884AD520002A4E2 /* ExampleUIWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExampleUIWebViewController.m; sourceTree = "<group>"; };
4034
2CA045B817117439006DEE8B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
4135
2CA045B917117439006DEE8B /* ExampleApp-iOS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "ExampleApp-iOS-Info.plist"; sourceTree = "<group>"; };
4236
2CA045BA17117439006DEE8B /* ExampleApp-iOS-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ExampleApp-iOS-Prefix.pch"; sourceTree = "<group>"; };
@@ -70,8 +64,6 @@
7064
isa = PBXGroup;
7165
children = (
7266
2C1562B4176B9F8400B4AE50 /* WebViewJavascriptBridge.js.txt */,
73-
2C1562A8176B9F6200B4AE50 /* WebViewJavascriptBridge.h */,
74-
2C1562A9176B9F6200B4AE50 /* WebViewJavascriptBridge.m */,
7567
0E8082DA19EDC32300479452 /* WKWebViewJavascriptBridge.m */,
7668
0E8082D919EDC32300479452 /* WKWebViewJavascriptBridge.h */,
7769
0E50601B1A01B442000BEEEA /* WebViewJavascriptBridgeBase.m */,
@@ -87,8 +79,6 @@
8779
2CA0465B1711AC8D006DEE8B /* ExampleApp.html */,
8880
2CA045BC17117439006DEE8B /* ExampleAppDelegate.h */,
8981
2CA045BD17117439006DEE8B /* ExampleAppDelegate.m */,
90-
2C45CA2A1884AD520002A4E2 /* ExampleUIWebViewController.h */,
91-
2C45CA2B1884AD520002A4E2 /* ExampleUIWebViewController.m */,
9282
0ECB01421A0EE1BA0037FF4E /* ExampleWKWebViewController.h */,
9383
0ECB01431A0EE1F20037FF4E /* ExampleWKWebViewController.m */,
9484
2C1562A7176B9F5400B4AE50 /* WebViewJavascriptBridge */,
@@ -171,6 +161,7 @@
171161
developmentRegion = English;
172162
hasScannedForEncodings = 0;
173163
knownRegions = (
164+
English,
174165
en,
175166
);
176167
mainGroup = 2CEB3EB01602563600548120;
@@ -202,9 +193,7 @@
202193
isa = PBXSourcesBuildPhase;
203194
buildActionMask = 2147483647;
204195
files = (
205-
2C1562C0176BA63500B4AE50 /* WebViewJavascriptBridge.m in Sources */,
206196
0E8082DB19EDC32300479452 /* WKWebViewJavascriptBridge.m in Sources */,
207-
2C45CA2C1884AD520002A4E2 /* ExampleUIWebViewController.m in Sources */,
208197
0ECB01441A0EE1F20037FF4E /* ExampleWKWebViewController.m in Sources */,
209198
2CA045C217117439006DEE8B /* ExampleAppDelegate.m in Sources */,
210199
0E50601C1A01B442000BEEEA /* WebViewJavascriptBridgeBase.m in Sources */,
@@ -247,7 +236,7 @@
247236
GCC_WARN_ABOUT_RETURN_TYPE = YES;
248237
GCC_WARN_UNINITIALIZED_AUTOS = YES;
249238
GCC_WARN_UNUSED_VARIABLE = YES;
250-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
239+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
251240
ONLY_ACTIVE_ARCH = YES;
252241
SDKROOT = iphoneos;
253242
};
@@ -267,7 +256,7 @@
267256
GCC_WARN_ABOUT_RETURN_TYPE = YES;
268257
GCC_WARN_UNINITIALIZED_AUTOS = YES;
269258
GCC_WARN_UNUSED_VARIABLE = YES;
270-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
259+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
271260
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
272261
SDKROOT = iphoneos;
273262
VALIDATE_PRODUCT = YES;
@@ -280,7 +269,6 @@
280269
GCC_PRECOMPILE_PREFIX_HEADER = YES;
281270
GCC_PREFIX_HEADER = "ExampleApp-iOS/ExampleApp-iOS-Prefix.pch";
282271
INFOPLIST_FILE = "ExampleApp-iOS/ExampleApp-iOS-Info.plist";
283-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
284272
PRODUCT_NAME = "ExampleApp-iOS";
285273
WRAPPER_EXTENSION = app;
286274
};
@@ -292,7 +280,6 @@
292280
GCC_PRECOMPILE_PREFIX_HEADER = YES;
293281
GCC_PREFIX_HEADER = "ExampleApp-iOS/ExampleApp-iOS-Prefix.pch";
294282
INFOPLIST_FILE = "ExampleApp-iOS/ExampleApp-iOS-Info.plist";
295-
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
296283
PRODUCT_NAME = "ExampleApp-iOS";
297284
WRAPPER_EXTENSION = app;
298285
};

Example Apps/ExampleApp-iOS/ExampleAppDelegate.m

+5-15
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
11
#import "ExampleAppDelegate.h"
2-
#import "ExampleUIWebViewController.h"
32
#import "ExampleWKWebViewController.h"
43

54
@implementation ExampleAppDelegate
65

76
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
87

9-
// 1. Create the UIWebView example
10-
ExampleUIWebViewController* UIWebViewExampleController = [[ExampleUIWebViewController alloc] init];
11-
UIWebViewExampleController.tabBarItem.title = @"UIWebView";
12-
13-
// 2. Create the tab footer and add the UIWebView example
14-
UITabBarController *tabBarController = [[UITabBarController alloc] init];
15-
[tabBarController addChildViewController:UIWebViewExampleController];
16-
17-
// 3. Create the WKWebView example for devices >= iOS 8
8+
// Create the WKWebView example
189
if([WKWebView class]) {
1910
ExampleWKWebViewController* WKWebViewExampleController = [[ExampleWKWebViewController alloc] init];
2011
WKWebViewExampleController.tabBarItem.title = @"WKWebView";
21-
[tabBarController addChildViewController:WKWebViewExampleController];
12+
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
13+
self.window.rootViewController = WKWebViewExampleController;
14+
[self.window makeKeyAndVisible];
2215
}
23-
24-
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
25-
self.window.rootViewController = tabBarController;
26-
[self.window makeKeyAndVisible];
16+
2717
return YES;
2818
}
2919

Example Apps/ExampleApp-iOS/ExampleUIWebViewController.h

-13
This file was deleted.

Example Apps/ExampleApp-iOS/ExampleUIWebViewController.m

-101
This file was deleted.

WebViewJavascriptBridge/WebViewJavascriptBridge.h

-41
This file was deleted.

0 commit comments

Comments
 (0)