Skip to content

Commit b37a34d

Browse files
kishikawakatsumikishikawakatsumi
committed
Merge pull request kishikawakatsumi#17 from kishikawakatsumi/fix_js_exception
Suppress JS exception due to same method/property name export by sub protocols.
2 parents c3cb698 + 2c74d9a commit b37a34d

34 files changed

Lines changed: 0 additions & 284 deletions

‎Classes/iOS/FrameworkSupport/Foundation/JSBNSDataDetector.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
#pragma clang diagnostic push
1313
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1414

15-
@property (readonly) NSString *pattern;
16-
@property (readonly) NSUInteger numberOfCaptureGroups;
17-
@property (readonly) NSRegularExpressionOptions options;
18-
@property (readonly) NSTextCheckingTypes checkingTypes;
19-
2015
+ (NSDataDetector *)dataDetectorWithTypes:(NSTextCheckingTypes)checkingTypes error:(NSError **)error;
2116

2217
- (id)initWithTypes:(NSTextCheckingTypes)checkingTypes error:(NSError **)error;

‎Classes/iOS/FrameworkSupport/Foundation/JSBNSURLSessionDataTask.h‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,6 @@
1313
#pragma clang diagnostic push
1414
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1515

16-
@property NSTimeInterval timeoutIntervalForResource;
17-
@property BOOL HTTPShouldSetCookies;
18-
@property (retain) NSURLCache *URLCache;
19-
@property (readonly) NSURLSessionTaskState state;
20-
@property (readonly, copy) NSURLRequest *originalRequest;
21-
@property BOOL sessionSendsLaunchEvents;
22-
@property (readonly, copy) NSURLResponse *response;
23-
@property BOOL allowsCellularAccess;
24-
@property (readonly) int64_t countOfBytesSent;
25-
@property (readonly, retain) id delegate;
26-
@property (readonly) int64_t countOfBytesReceived;
27-
@property (copy) NSString *taskDescription;
28-
@property NSInteger HTTPMaximumConnectionsPerHost;
29-
@property (retain) NSURLCredentialStorage *URLCredentialStorage;
30-
@property BOOL HTTPShouldUsePipelining;
31-
@property (readonly) int64_t countOfBytesExpectedToReceive;
32-
@property (readonly, retain) NSOperationQueue *delegateQueue;
33-
@property (readonly) NSUInteger taskIdentifier;
34-
@property (retain) NSHTTPCookieStorage *HTTPCookieStorage;
35-
@property (readonly, copy) NSURLRequest *currentRequest;
36-
@property SSLProtocol TLSMinimumSupportedProtocol;
37-
@property (copy) NSDictionary *HTTPAdditionalHeaders;
38-
@property (readonly, copy) NSString *identifier;
39-
@property NSHTTPCookieAcceptPolicy HTTPCookieAcceptPolicy;
40-
@property NSURLRequestCachePolicy requestCachePolicy;
41-
@property NSTimeInterval timeoutIntervalForRequest;
42-
@property (copy) NSDictionary *connectionProxyDictionary;
43-
@property (readonly) int64_t countOfBytesExpectedToSend;
44-
@property (copy) NSString *sessionDescription;
45-
@property NSURLRequestNetworkServiceType networkServiceType;
46-
@property (readonly, copy) NSURLSessionConfiguration *configuration;
47-
@property (copy) NSArray *protocolClasses;
48-
@property SSLProtocol TLSMaximumSupportedProtocol;
49-
@property (readonly, copy) NSError *error;
50-
@property (getter = isDiscretionary) BOOL discretionary;
51-
5216
#pragma clang diagnostic pop
5317

5418
@end

‎Classes/iOS/FrameworkSupport/Foundation/JSBNSURLSessionDownloadTask.h‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,6 @@
1313
#pragma clang diagnostic push
1414
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1515

16-
@property NSTimeInterval timeoutIntervalForResource;
17-
@property BOOL HTTPShouldSetCookies;
18-
@property (retain) NSURLCache *URLCache;
19-
@property (readonly) NSURLSessionTaskState state;
20-
@property (readonly, copy) NSURLRequest *originalRequest;
21-
@property BOOL sessionSendsLaunchEvents;
22-
@property (readonly, copy) NSURLResponse *response;
23-
@property BOOL allowsCellularAccess;
24-
@property (readonly) int64_t countOfBytesSent;
25-
@property (readonly, retain) id delegate;
26-
@property (readonly) int64_t countOfBytesReceived;
27-
@property (copy) NSString *taskDescription;
28-
@property NSInteger HTTPMaximumConnectionsPerHost;
29-
@property (retain) NSURLCredentialStorage *URLCredentialStorage;
30-
@property BOOL HTTPShouldUsePipelining;
31-
@property (readonly) int64_t countOfBytesExpectedToReceive;
32-
@property (readonly, retain) NSOperationQueue *delegateQueue;
33-
@property (readonly) NSUInteger taskIdentifier;
34-
@property (retain) NSHTTPCookieStorage *HTTPCookieStorage;
35-
@property (readonly, copy) NSURLRequest *currentRequest;
36-
@property SSLProtocol TLSMinimumSupportedProtocol;
37-
@property (copy) NSDictionary *HTTPAdditionalHeaders;
38-
@property (readonly, copy) NSString *identifier;
39-
@property NSHTTPCookieAcceptPolicy HTTPCookieAcceptPolicy;
40-
@property NSURLRequestCachePolicy requestCachePolicy;
41-
@property NSTimeInterval timeoutIntervalForRequest;
42-
@property (copy) NSDictionary *connectionProxyDictionary;
43-
@property (readonly) int64_t countOfBytesExpectedToSend;
44-
@property (copy) NSString *sessionDescription;
45-
@property NSURLRequestNetworkServiceType networkServiceType;
46-
@property (readonly, copy) NSURLSessionConfiguration *configuration;
47-
@property (copy) NSArray *protocolClasses;
48-
@property SSLProtocol TLSMaximumSupportedProtocol;
49-
@property (readonly, copy) NSError *error;
50-
@property (getter = isDiscretionary) BOOL discretionary;
51-
5216
- (void)cancelByProducingResumeData:(void (^)(NSData *resumeData))completionHandler;
5317

5418
#pragma clang diagnostic pop

‎Classes/iOS/FrameworkSupport/Foundation/JSBNSURLSessionUploadTask.h‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,6 @@
1313
#pragma clang diagnostic push
1414
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1515

16-
@property NSTimeInterval timeoutIntervalForResource;
17-
@property BOOL HTTPShouldSetCookies;
18-
@property (retain) NSURLCache *URLCache;
19-
@property (readonly) NSURLSessionTaskState state;
20-
@property (readonly, copy) NSURLRequest *originalRequest;
21-
@property BOOL sessionSendsLaunchEvents;
22-
@property (readonly, copy) NSURLResponse *response;
23-
@property BOOL allowsCellularAccess;
24-
@property (readonly) int64_t countOfBytesSent;
25-
@property (readonly, retain) id delegate;
26-
@property (readonly) int64_t countOfBytesReceived;
27-
@property (copy) NSString *taskDescription;
28-
@property NSInteger HTTPMaximumConnectionsPerHost;
29-
@property (retain) NSURLCredentialStorage *URLCredentialStorage;
30-
@property BOOL HTTPShouldUsePipelining;
31-
@property (readonly) int64_t countOfBytesExpectedToReceive;
32-
@property (readonly, retain) NSOperationQueue *delegateQueue;
33-
@property (readonly) NSUInteger taskIdentifier;
34-
@property (retain) NSHTTPCookieStorage *HTTPCookieStorage;
35-
@property (readonly, copy) NSURLRequest *currentRequest;
36-
@property SSLProtocol TLSMinimumSupportedProtocol;
37-
@property (copy) NSDictionary *HTTPAdditionalHeaders;
38-
@property (readonly, copy) NSString *identifier;
39-
@property NSHTTPCookieAcceptPolicy HTTPCookieAcceptPolicy;
40-
@property NSURLRequestCachePolicy requestCachePolicy;
41-
@property NSTimeInterval timeoutIntervalForRequest;
42-
@property (copy) NSDictionary *connectionProxyDictionary;
43-
@property (readonly) int64_t countOfBytesExpectedToSend;
44-
@property (copy) NSString *sessionDescription;
45-
@property NSURLRequestNetworkServiceType networkServiceType;
46-
@property (readonly, copy) NSURLSessionConfiguration *configuration;
47-
@property (copy) NSArray *protocolClasses;
48-
@property SSLProtocol TLSMaximumSupportedProtocol;
49-
@property (readonly, copy) NSError *error;
50-
@property (getter = isDiscretionary) BOOL discretionary;
51-
5216
#pragma clang diagnostic pop
5317

5418
@end

‎Classes/iOS/FrameworkSupport/QuartzCore/JSBCAAnimation.h‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,6 @@
1111
#pragma clang diagnostic push
1212
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1313

14-
@property (retain) CAMediaTimingFunction *timingFunction;
15-
@property (copy) NSArray *values;
16-
@property (copy) NSString *subtype;
17-
@property (retain) id delegate;
18-
@property (retain) id filter;
19-
@property (copy) NSArray *keyTimes;
20-
@property (retain) CAValueFunction *valueFunction;
21-
@property (getter = isCumulative) BOOL cumulative;
22-
@property (copy) NSArray *timingFunctions;
23-
@property id path;
24-
@property (copy) NSString *calculationMode;
25-
@property (copy) NSString *rotationMode;
26-
@property (copy) NSString *type;
27-
@property float startProgress, endProgress;
28-
@property (copy) NSArray *animations;
29-
@property (copy) NSArray *tensionValues, *continuityValues, *biasValues;
30-
@property (copy) NSString *keyPath;
31-
@property (retain) id fromValue, toValue, byValue;
32-
@property (getter = isAdditive) BOOL additive;
33-
@property (getter = isRemovedOnCompletion) BOOL removedOnCompletion;
34-
3514
+ (id)animation;
3615
+ (id)defaultValueForKey:(NSString *)key;
3716

‎Classes/iOS/FrameworkSupport/QuartzCore/JSBCABasicAnimation.h‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,6 @@
1111
#pragma clang diagnostic push
1212
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1313

14-
@property (retain) CAMediaTimingFunction *timingFunction;
15-
@property (copy) NSArray *values;
16-
@property (copy) NSString *subtype;
17-
@property (retain) id delegate;
18-
@property (retain) id filter;
19-
@property (copy) NSArray *keyTimes;
20-
@property (retain) CAValueFunction *valueFunction;
21-
@property (getter = isCumulative) BOOL cumulative;
22-
@property (copy) NSArray *timingFunctions;
23-
@property id path;
24-
@property (copy) NSString *calculationMode;
25-
@property (copy) NSString *rotationMode;
26-
@property (copy) NSString *type;
27-
@property float startProgress, endProgress;
28-
@property (copy) NSArray *animations;
29-
@property (copy) NSArray *tensionValues, *continuityValues, *biasValues;
30-
@property (copy) NSString *keyPath;
31-
@property (retain) id fromValue, toValue, byValue;
32-
@property (getter = isAdditive) BOOL additive;
33-
@property (getter = isRemovedOnCompletion) BOOL removedOnCompletion;
34-
3514
#pragma clang diagnostic pop
3615

3716
@end

‎Classes/iOS/FrameworkSupport/QuartzCore/JSBCAKeyframeAnimation.h‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,6 @@
1111
#pragma clang diagnostic push
1212
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1313

14-
@property (retain) CAMediaTimingFunction *timingFunction;
15-
@property (copy) NSArray *values;
16-
@property (copy) NSString *subtype;
17-
@property (retain) id delegate;
18-
@property (retain) id filter;
19-
@property (copy) NSArray *keyTimes;
20-
@property (retain) CAValueFunction *valueFunction;
21-
@property (getter = isCumulative) BOOL cumulative;
22-
@property (copy) NSArray *timingFunctions;
23-
@property id path;
24-
@property (copy) NSString *calculationMode;
25-
@property (copy) NSString *rotationMode;
26-
@property (copy) NSString *type;
27-
@property float startProgress, endProgress;
28-
@property (copy) NSArray *animations;
29-
@property (copy) NSArray *tensionValues, *continuityValues, *biasValues;
30-
@property (copy) NSString *keyPath;
31-
@property (retain) id fromValue, toValue, byValue;
32-
@property (getter = isAdditive) BOOL additive;
33-
@property (getter = isRemovedOnCompletion) BOOL removedOnCompletion;
34-
3514
#pragma clang diagnostic pop
3615

3716
@end

‎Classes/iOS/FrameworkSupport/QuartzCore/JSBCAScrollLayer.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
#pragma clang diagnostic push
1111
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1212

13-
@property (readonly) CGRect visibleRect;
14-
@property (copy) NSString *scrollMode;
15-
1613
- (void)scrollToPoint:(CGPoint)p;
1714
- (void)scrollToRect:(CGRect)r;
1815

‎Classes/iOS/FrameworkSupport/UIKit/JSBNSMutableParagraphStyle.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,6 @@
1313
#pragma clang diagnostic push
1414
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
1515

16-
@property (readonly) NSDictionary *options;
17-
@property (readwrite) CGFloat paragraphSpacing;
18-
@property (readwrite, copy) NSArray *tabStops;
19-
@property (readwrite) CGFloat headIndent;
20-
@property (readwrite) NSLineBreakMode lineBreakMode;
21-
@property (readwrite) float hyphenationFactor;
22-
@property (readwrite) NSTextAlignment alignment;
23-
@property (readonly) CGFloat location;
24-
@property (readwrite) CGFloat tailIndent;
25-
@property (readwrite) CGFloat firstLineHeadIndent;
26-
@property (readwrite) CGFloat lineSpacing;
27-
@property (readwrite) CGFloat minimumLineHeight;
28-
@property (readwrite) CGFloat paragraphSpacingBefore;
29-
@property (readwrite) CGFloat maximumLineHeight;
30-
@property (readwrite) CGFloat lineHeightMultiple;
31-
@property (readwrite) NSWritingDirection baseWritingDirection;
32-
@property (readwrite) CGFloat defaultTabInterval;
33-
3416
#pragma clang diagnostic pop
3517

3618
@end

‎Classes/iOS/FrameworkSupport/UIKit/JSBUIButton.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
@property (nonatomic) CGSize titleShadowOffset;
2828
@property (nonatomic) UIEdgeInsets titleEdgeInsets;
2929
@property (nonatomic) NSLineBreakMode lineBreakMode;
30-
@property (nonatomic, retain) UIColor *tintColor;
3130
@property (nonatomic, retain) UIFont *font;
3231
@property (nonatomic, readonly, retain) UIColor *currentTitleShadowColor;
3332
@property (nonatomic, readonly, retain) UILabel *titleLabel;

0 commit comments

Comments
 (0)