Skip to content

Commit b458d79

Browse files
committed
Added compiler flags to include Yosemite
1 parent 026a712 commit b458d79

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

Example Apps/ExampleApp-iOS/ExampleAppViewController.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88

99
#import <UIKit/UIKit.h>
1010

11+
#if (__MAC_OS_X_VERSION_MAX_ALLOWED > __MAC_10_9 || __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1)
12+
#define exampleSupportsWKWebKit
13+
#endif
14+
1115

12-
#if defined(__IPHONE_8_0)
16+
#if defined(exampleSupportsWKWebKit)
1317
#import <WebKit/WebKit.h>
1418
#define EXAMPLE_WEBVIEW_TYPE WKWebView
1519
#define EXAMPLE_WEBVIEW_DELEGATE_TYPE NSObject<WKNavigationDelegate>

Example Apps/ExampleApp-iOS/ExampleAppViewController.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#import "ExampleAppViewController.h"
1010

11-
#if defined(__IPHONE_8_0)
11+
#if defined(exampleSupportsWKWebKit)
1212
#import "WKWebViewJavascriptBridge.h"
1313
# else
1414
#import "WebViewJavascriptBridge.h"
@@ -24,8 +24,9 @@ @implementation ExampleAppViewController
2424

2525
- (void)viewWillAppear:(BOOL)animated {
2626
if (_bridge) { return; }
27-
28-
#if defined(__IPHONE_8_0)
27+
28+
#if defined(exampleSupportsWKWebKit)
29+
NSLog(@"---------------------------------------");
2930
WKWebView* webView = [[NSClassFromString(@"WKWebView") alloc] initWithFrame:self.view.bounds];
3031
webView.navigationDelegate = self;
3132
[self.view addSubview:webView];

WebViewJavascriptBridge/WKWebViewJavascriptBridge.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
// Copyright (c) 2014 Loki Meyburg. All rights reserved.
66
//
77

8-
#if defined(__IPHONE_8_0)
8+
#if (__MAC_OS_X_VERSION_MAX_ALLOWED > __MAC_10_9 || __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1)
9+
#define supportsWKWebKit
10+
#endif
11+
12+
#if defined(supportsWKWebKit )
913

1014
#import <Foundation/Foundation.h>
1115
#define kCustomProtocolScheme @"wvjbscheme"

WebViewJavascriptBridge/WKWebViewJavascriptBridge.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
// Copyright (c) 2014 Loki Meyburg. All rights reserved.
66
//
77

8-
#if defined(__IPHONE_8_0)
98

109
#import "WKWebViewJavascriptBridge.h"
1110

11+
#if defined(supportsWKWebKit)
12+
1213
typedef NSDictionary WVJBMessage;
1314

1415
@implementation WKWebViewJavascriptBridge {

0 commit comments

Comments
 (0)