diff --git a/Easydict.xcodeproj/project.pbxproj b/Easydict.xcodeproj/project.pbxproj index 2f25f52c8..f1d95e31b 100644 --- a/Easydict.xcodeproj/project.pbxproj +++ b/Easydict.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 55; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -2021,7 +2021,7 @@ }; }; buildConfigurationList = C99EEB132385796700FEE666 /* Build configuration list for PBXProject "Easydict" */; - compatibilityVersion = "Xcode 13.0"; + compatibilityVersion = "Xcode 12.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -2775,8 +2775,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Alamofire/Alamofire"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 5.8.1; + kind = exactVersion; + version = 5.2.2; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Easydict.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Easydict.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Easydict.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Easydict.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4eaee067b..8031671e3 100644 --- a/Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,14 +1,16 @@ { - "pins" : [ - { - "identity" : "alamofire", - "kind" : "remoteSourceControl", - "location" : "https://github.com/Alamofire/Alamofire", - "state" : { - "revision" : "3dc6a42c7727c49bf26508e29b0a0b35f9c7e1ad", - "version" : "5.8.1" + "object": { + "pins": [ + { + "package": "Alamofire", + "repositoryURL": "https://github.com/Alamofire/Alamofire", + "state": { + "branch": null, + "revision": "becd9a729a37bdbef5bc39dc3c702b99f9e3d046", + "version": "5.2.2" + } } - } - ], - "version" : 2 + ] + }, + "version": 1 } diff --git a/Easydict/App/Assets.xcassets/arrow.clockwise.circle.imageset/Contents.json b/Easydict/App/Assets.xcassets/arrow.clockwise.circle.imageset/Contents.json new file mode 100644 index 000000000..e0c536d92 --- /dev/null +++ b/Easydict/App/Assets.xcassets/arrow.clockwise.circle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "arrow_clockwise_circle.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/arrow.clockwise.circle.imageset/arrow_clockwise_circle.png b/Easydict/App/Assets.xcassets/arrow.clockwise.circle.imageset/arrow_clockwise_circle.png new file mode 100644 index 000000000..fc25e5353 Binary files /dev/null and b/Easydict/App/Assets.xcassets/arrow.clockwise.circle.imageset/arrow_clockwise_circle.png differ diff --git a/Easydict/App/Assets.xcassets/arrow.forward.square.imageset/Contents.json b/Easydict/App/Assets.xcassets/arrow.forward.square.imageset/Contents.json new file mode 100644 index 000000000..70421c8f9 --- /dev/null +++ b/Easydict/App/Assets.xcassets/arrow.forward.square.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "arrow.forward.square.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/arrow.forward.square.imageset/arrow.forward.square.png b/Easydict/App/Assets.xcassets/arrow.forward.square.imageset/arrow.forward.square.png new file mode 100644 index 000000000..4dbadb082 Binary files /dev/null and b/Easydict/App/Assets.xcassets/arrow.forward.square.imageset/arrow.forward.square.png differ diff --git a/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/Contents.json b/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/Contents.json new file mode 100644 index 000000000..038cf5aea --- /dev/null +++ b/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "camera-metering-spot_20.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "camera-metering-spot (1).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/camera-metering-spot (1).png b/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/camera-metering-spot (1).png new file mode 100644 index 000000000..f1d9739ba Binary files /dev/null and b/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/camera-metering-spot (1).png differ diff --git a/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/camera-metering-spot_20.png b/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/camera-metering-spot_20.png new file mode 100644 index 000000000..eb053e77b Binary files /dev/null and b/Easydict/App/Assets.xcassets/camera.metering.spot.imageset/camera-metering-spot_20.png differ diff --git a/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/Contents.json b/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/Contents.json new file mode 100644 index 000000000..ed350ca3b --- /dev/null +++ b/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "edit-camera.viewfinder.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "edit-camera.viewfinder-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/edit-camera.viewfinder-1.png b/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/edit-camera.viewfinder-1.png new file mode 100644 index 000000000..3184b5002 Binary files /dev/null and b/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/edit-camera.viewfinder-1.png differ diff --git a/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/edit-camera.viewfinder.png b/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/edit-camera.viewfinder.png new file mode 100644 index 000000000..52e9d15be Binary files /dev/null and b/Easydict/App/Assets.xcassets/camera.viewfinder.imageset/edit-camera.viewfinder.png differ diff --git a/Easydict/App/Assets.xcassets/dock.rectangle.imageset/Contents.json b/Easydict/App/Assets.xcassets/dock.rectangle.imageset/Contents.json new file mode 100644 index 000000000..41df1edfb --- /dev/null +++ b/Easydict/App/Assets.xcassets/dock.rectangle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "dock.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/dock.rectangle.imageset/dock.png b/Easydict/App/Assets.xcassets/dock.rectangle.imageset/dock.png new file mode 100644 index 000000000..fc8205791 Binary files /dev/null and b/Easydict/App/Assets.xcassets/dock.rectangle.imageset/dock.png differ diff --git a/Easydict/App/Assets.xcassets/highlighter.imageset/Contents.json b/Easydict/App/Assets.xcassets/highlighter.imageset/Contents.json new file mode 100644 index 000000000..150250380 --- /dev/null +++ b/Easydict/App/Assets.xcassets/highlighter.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "select_40.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "select.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/highlighter.imageset/select.png b/Easydict/App/Assets.xcassets/highlighter.imageset/select.png new file mode 100644 index 000000000..a78109432 Binary files /dev/null and b/Easydict/App/Assets.xcassets/highlighter.imageset/select.png differ diff --git a/Easydict/App/Assets.xcassets/highlighter.imageset/select_40.png b/Easydict/App/Assets.xcassets/highlighter.imageset/select_40.png new file mode 100644 index 000000000..b35223cf1 Binary files /dev/null and b/Easydict/App/Assets.xcassets/highlighter.imageset/select_40.png differ diff --git a/Easydict/App/Assets.xcassets/keyboard.imageset/Contents.json b/Easydict/App/Assets.xcassets/keyboard.imageset/Contents.json new file mode 100644 index 000000000..abdf5ce84 --- /dev/null +++ b/Easydict/App/Assets.xcassets/keyboard.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "keyboard_20.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "keyboard (2).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/keyboard.imageset/keyboard (2).png b/Easydict/App/Assets.xcassets/keyboard.imageset/keyboard (2).png new file mode 100644 index 000000000..7ca989901 Binary files /dev/null and b/Easydict/App/Assets.xcassets/keyboard.imageset/keyboard (2).png differ diff --git a/Easydict/App/Assets.xcassets/keyboard.imageset/keyboard_20.png b/Easydict/App/Assets.xcassets/keyboard.imageset/keyboard_20.png new file mode 100644 index 000000000..7a0d20a8c Binary files /dev/null and b/Easydict/App/Assets.xcassets/keyboard.imageset/keyboard_20.png differ diff --git a/Easydict/App/Assets.xcassets/pause.circle.imageset/Contents.json b/Easydict/App/Assets.xcassets/pause.circle.imageset/Contents.json new file mode 100644 index 000000000..a08d3191f --- /dev/null +++ b/Easydict/App/Assets.xcassets/pause.circle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Pause.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/pause.circle.imageset/Pause.png b/Easydict/App/Assets.xcassets/pause.circle.imageset/Pause.png new file mode 100644 index 000000000..e1cc3ed7b Binary files /dev/null and b/Easydict/App/Assets.xcassets/pause.circle.imageset/Pause.png differ diff --git a/Easydict/App/Assets.xcassets/setting/toolbar_privacy.imageset/Contents.json b/Easydict/App/Assets.xcassets/setting/toolbar_privacy.imageset/Contents.json index d6c01d3c7..4d3912c0e 100644 --- a/Easydict/App/Assets.xcassets/setting/toolbar_privacy.imageset/Contents.json +++ b/Easydict/App/Assets.xcassets/setting/toolbar_privacy.imageset/Contents.json @@ -10,7 +10,6 @@ "scale" : "2x" }, { - "filename" : "Privacy.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Easydict/App/Assets.xcassets/setting/toolbar_privacy.imageset/Privacy.png b/Easydict/App/Assets.xcassets/setting/toolbar_privacy.imageset/Privacy.png deleted file mode 100644 index 12ccf9bf3..000000000 Binary files a/Easydict/App/Assets.xcassets/setting/toolbar_privacy.imageset/Privacy.png and /dev/null differ diff --git a/Easydict/App/Assets.xcassets/stop.circle.imageset/Contents.json b/Easydict/App/Assets.xcassets/stop.circle.imageset/Contents.json new file mode 100644 index 000000000..bce7266eb --- /dev/null +++ b/Easydict/App/Assets.xcassets/stop.circle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "stop circle.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/App/Assets.xcassets/stop.circle.imageset/stop circle.png b/Easydict/App/Assets.xcassets/stop.circle.imageset/stop circle.png new file mode 100644 index 000000000..c5e47c342 Binary files /dev/null and b/Easydict/App/Assets.xcassets/stop.circle.imageset/stop circle.png differ diff --git "a/Easydict/App/Assets.xcassets/xmark.circle.fill.imageset/2.1\345\213\276.png" "b/Easydict/App/Assets.xcassets/xmark.circle.fill.imageset/2.1\345\213\276.png" new file mode 100644 index 000000000..5451c0131 Binary files /dev/null and "b/Easydict/App/Assets.xcassets/xmark.circle.fill.imageset/2.1\345\213\276.png" differ diff --git a/Easydict/App/Assets.xcassets/xmark.circle.fill.imageset/Contents.json b/Easydict/App/Assets.xcassets/xmark.circle.fill.imageset/Contents.json new file mode 100644 index 000000000..f7d016738 --- /dev/null +++ b/Easydict/App/Assets.xcassets/xmark.circle.fill.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "2.1勾.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Easydict/Feature/PerferenceWindow/DisableAutoSelectTextViewController/EZDisableAutoSelectTextViewController.m b/Easydict/Feature/PerferenceWindow/DisableAutoSelectTextViewController/EZDisableAutoSelectTextViewController.m index 68b3c87f7..4d3168d48 100644 --- a/Easydict/Feature/PerferenceWindow/DisableAutoSelectTextViewController/EZDisableAutoSelectTextViewController.m +++ b/Easydict/Feature/PerferenceWindow/DisableAutoSelectTextViewController/EZDisableAutoSelectTextViewController.m @@ -131,6 +131,7 @@ - (NSTableView *)tableView { tableView.style = NSTableViewStylePlain; } else { // Fallback on earlier versions + [tableView setHeaderView:nil]; } NSTableColumn *column = [[NSTableColumn alloc] initWithIdentifier:EZColumnId]; diff --git a/Easydict/Feature/PerferenceWindow/EZPrivacyViewController.m b/Easydict/Feature/PerferenceWindow/EZPrivacyViewController.m index d0f75f40b..0e54e62a0 100644 --- a/Easydict/Feature/PerferenceWindow/EZPrivacyViewController.m +++ b/Easydict/Feature/PerferenceWindow/EZPrivacyViewController.m @@ -147,11 +147,12 @@ - (NSImage *)toolbarItemImage { // privacyImage = [privacyImage imageWithTintColor:[NSColor mm_colorWithHexString:@"#1296DB"]]; // privacyImage = [privacyImage resizeToSize:CGSizeMake(14, 14)]; - NSImage *privacyImage = [NSImage imageNamed:@"toolbar_privacy"]; - privacyImage = [NSImage ez_imageWithSymbolName:@"hand.raised.square" size:CGSizeMake(18, 16)]; - privacyImage = [privacyImage imageWithTintColor:[NSColor ez_imageTintBlueColor]]; - - return privacyImage; +// NSImage *privacyImage = [NSImage imageNamed:@"toolbar_privacy"]; +// privacyImage = [NSImage ez_imageWithSymbolName:@"hand.raised.square" size:CGSizeMake(18, 16)]; +// privacyImage = [privacyImage imageWithTintColor:[NSColor ez_imageTintBlueColor]]; +// +// return privacyImage; + return [NSImage imageNamed:@"toolbar_privacy"]; } - (BOOL)hasResizableWidth { diff --git a/Easydict/Feature/PerferenceWindow/ServiceViewController/EZServiceViewController.m b/Easydict/Feature/PerferenceWindow/ServiceViewController/EZServiceViewController.m index 21c8d7150..bd69284dc 100644 --- a/Easydict/Feature/PerferenceWindow/ServiceViewController/EZServiceViewController.m +++ b/Easydict/Feature/PerferenceWindow/ServiceViewController/EZServiceViewController.m @@ -159,6 +159,7 @@ - (NSTableView *)tableView { tableView.style = NSTableViewStylePlain; } else { // Fallback on earlier versions + [tableView setHeaderView:nil]; } NSTableColumn *column = [[NSTableColumn alloc] initWithIdentifier:EZColumnId]; diff --git a/Easydict/Feature/Service/Apple/EZAppleService.m b/Easydict/Feature/Service/Apple/EZAppleService.m index 6fcf84125..172e4a9d0 100644 --- a/Easydict/Feature/Service/Apple/EZAppleService.m +++ b/Easydict/Feature/Service/Apple/EZAppleService.m @@ -806,7 +806,7 @@ - (void)ocrImage:(NSImage *)image } if (@available(macOS 13.0, *)) { - request.automaticallyDetectsLanguage = automaticallyDetectsLanguage; +// request.automaticallyDetectsLanguage = automaticallyDetectsLanguage; } if (![preferredLanguage isEqualToString:EZLanguageAuto]) { diff --git a/Easydict/Feature/Service/Caiyun/CaiyunService.swift b/Easydict/Feature/Service/Caiyun/CaiyunService.swift index 00f9903b1..7d02d50a5 100644 --- a/Easydict/Feature/Service/Caiyun/CaiyunService.swift +++ b/Easydict/Feature/Service/Caiyun/CaiyunService.swift @@ -31,11 +31,11 @@ public final class CaiyunService: QueryService { } return orderedDict } - - override public func ocr(_: EZQueryModel) async throws -> EZOCRResult { - NSLog("Caiyun Translate does not support OCR") - throw QueryServiceError.notSupported - } + +// override public func ocr(_: EZQueryModel) async throws -> EZOCRResult { +// NSLog("Caiyun Translate does not support OCR") +// throw QueryServiceError.notSupported +// } private var apiEndPoint = "https://api.interpreter.caiyunai.com/v1/translator" @@ -45,7 +45,7 @@ public final class CaiyunService: QueryService { // easydict://writeKeyValue?EZCaiyunToken= private var token: String { let token = UserDefaults.standard.string(forKey: EZCaiyunToken) - if let token, !token.isEmpty { + if let token = token, !token.isEmpty { return token } else { return CaiyunService.defaultTestToken @@ -89,8 +89,8 @@ public final class CaiyunService: QueryService { headers: headers) .validate() .responseDecodable(of: CaiyunResponse.self) { [weak self] response in - guard let self else { return } - let result = self.result + guard let me = self else { return } + let result = me.result switch response.result { case let .success(value): result.from = from diff --git a/Easydict/Feature/Service/Model/EZServiceTypes.m b/Easydict/Feature/Service/Model/EZServiceTypes.m index 9deb9c25b..e6cdffc6f 100644 --- a/Easydict/Feature/Service/Model/EZServiceTypes.m +++ b/Easydict/Feature/Service/Model/EZServiceTypes.m @@ -60,7 +60,7 @@ + (instancetype)allocWithZone:(struct _NSZone *)zone { EZServiceTypeBing, [EZBingService class], EZServiceTypeVolcano, [EZVolcanoTranslate class], EZServiceTypeNiuTrans, [EZNiuTransTranslate class], - EZServiceTypeCaiyun, [EZCaiyunService class], +// EZServiceTypeCaiyun, [EZCaiyunService class], nil]; return allServiceDict; } diff --git a/Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.h b/Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.h index d1391f614..f0b4140ee 100644 --- a/Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.h +++ b/Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.h @@ -12,10 +12,6 @@ NS_ASSUME_NONNULL_BEGIN @interface NSImage (EZSymbolmage) -+ (NSImage *)ez_imageWithSymbolName:(NSString *)name; - -+ (NSImage *)ez_imageWithSymbolName:(NSString *)name size:(CGSize)size; - @end NS_ASSUME_NONNULL_END diff --git a/Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.m b/Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.m index 5945baff7..938bbe56d 100644 --- a/Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.m +++ b/Easydict/Feature/Utility/EZCategory/NSImage/NSImage+EZSymbolmage.m @@ -30,6 +30,7 @@ + (NSImage *)ez_imageWithSymbolName:(NSString *)name size:(CGSize)size { } } else { // Fallback on earlier versions + NSLog(@"ez_imageWithSymbolName: %@", name); image = [NSImage imageNamed:name]; } image = [image resizeToSize:size]; diff --git a/Easydict/Feature/ViewController/View/CustomButton/EZAudioButton/EZAudioButton.m b/Easydict/Feature/ViewController/View/CustomButton/EZAudioButton/EZAudioButton.m index f2620a0c0..65721f4fb 100644 --- a/Easydict/Feature/ViewController/View/CustomButton/EZAudioButton/EZAudioButton.m +++ b/Easydict/Feature/ViewController/View/CustomButton/EZAudioButton/EZAudioButton.m @@ -64,7 +64,7 @@ - (void)setIsPlaying:(BOOL)isPlaying { // NSImage *audioImage = [NSImage ez_imageWithSymbolName:symbolName size:CGSizeMake(15, 15)]; NSImage *playImage = [NSImage imageNamed:@"audio"]; - NSImage *pauseImage = [NSImage ez_imageWithSymbolName:@"pause.circle"]; + NSImage *pauseImage = [NSImage imageNamed:@"pause.circle"]; self.image = isPlaying ? pauseImage : playImage; diff --git a/Easydict/Feature/ViewController/View/CustomButton/EZReplaceTextButton/EZReplaceTextButton.m b/Easydict/Feature/ViewController/View/CustomButton/EZReplaceTextButton/EZReplaceTextButton.m index 7836f750a..b94c2b0be 100644 --- a/Easydict/Feature/ViewController/View/CustomButton/EZReplaceTextButton/EZReplaceTextButton.m +++ b/Easydict/Feature/ViewController/View/CustomButton/EZReplaceTextButton/EZReplaceTextButton.m @@ -22,7 +22,7 @@ - (instancetype)initWithFrame:(NSRect)frameRect { } - (void)setup { - self.image = [NSImage ez_imageWithSymbolName:@"arrow.forward.square"]; + self.image = [NSImage imageNamed:@"arrow.forward.square"]; [self excuteLight:^(NSButton *button) { button.image = [button.image imageWithTintColor:[NSColor ez_imageTintLightColor]]; diff --git a/Easydict/Feature/ViewController/View/CustomButton/EZSymbolImageButton/EZSymbolImageButton.m b/Easydict/Feature/ViewController/View/CustomButton/EZSymbolImageButton/EZSymbolImageButton.m index 764d9345d..06f9a96f8 100644 --- a/Easydict/Feature/ViewController/View/CustomButton/EZSymbolImageButton/EZSymbolImageButton.m +++ b/Easydict/Feature/ViewController/View/CustomButton/EZSymbolImageButton/EZSymbolImageButton.m @@ -13,7 +13,7 @@ @implementation EZSymbolImageButton + (instancetype)buttonWithSybolImageName:(NSString *)sybolImageName { EZSymbolImageButton *button = [[EZSymbolImageButton alloc] init]; - NSImage *audioImage = [NSImage ez_imageWithSymbolName:sybolImageName]; + NSImage *audioImage = [NSImage imageNamed:@"audio"]; button.image = audioImage; [button excuteLight:^(NSButton *button) { diff --git a/Easydict/Feature/ViewController/View/QueryView/EZQueryView.m b/Easydict/Feature/ViewController/View/QueryView/EZQueryView.m index 6f41a4113..79a03b757 100644 --- a/Easydict/Feature/ViewController/View/QueryView/EZQueryView.m +++ b/Easydict/Feature/ViewController/View/QueryView/EZQueryView.m @@ -154,7 +154,7 @@ - (void)setup { [self addSubview:clearButton]; self.clearButton = clearButton; - NSImage *clearImage = [NSImage ez_imageWithSymbolName:@"xmark.circle.fill"]; + NSImage *clearImage = [NSImage imageNamed:@"xmark.circle.fill"]; clearImage = [clearImage imageWithTintColor:[NSColor mm_colorWithHexString:@"#868686"]]; clearButton.image = clearImage; diff --git a/Easydict/Feature/ViewController/View/ResultView/EZResultView.m b/Easydict/Feature/ViewController/View/ResultView/EZResultView.m index 736481b25..46f51c8fa 100644 --- a/Easydict/Feature/ViewController/View/ResultView/EZResultView.m +++ b/Easydict/Feature/ViewController/View/ResultView/EZResultView.m @@ -144,7 +144,7 @@ - (void)setup { EZHoverButton *stopButton = [[EZHoverButton alloc] init]; self.stopButton = stopButton; [self addSubview:stopButton]; - NSImage *stopImage = [NSImage ez_imageWithSymbolName:@"stop.circle"]; + NSImage *stopImage = [NSImage imageNamed:@"stop.circle"]; stopImage = [stopImage imageWithTintColor:[NSColor mm_colorWithHexString:@"#707070"]]; stopButton.image = stopImage; stopButton.mas_key = @"stopButton"; @@ -161,7 +161,7 @@ - (void)setup { EZHoverButton *retryButton = [[EZHoverButton alloc] init]; self.retryButton = retryButton; [self addSubview:retryButton]; - NSImage *retryImage = [NSImage ez_imageWithSymbolName:@"arrow.clockwise.circle"]; + NSImage *retryImage = [NSImage imageNamed:@"arrow.clockwise.circle"]; retryButton.image = retryImage; retryButton.mas_key = @"retryButton"; retryButton.toolTip = NSLocalizedString(@"retry", nil); diff --git a/Easydict/Feature/ViewController/View/WordResultView/EZWordResultView.m b/Easydict/Feature/ViewController/View/WordResultView/EZWordResultView.m index ba9005e78..31ca6ab30 100644 --- a/Easydict/Feature/ViewController/View/WordResultView/EZWordResultView.m +++ b/Easydict/Feature/ViewController/View/WordResultView/EZWordResultView.m @@ -840,7 +840,7 @@ - (void)refreshWithResult:(EZQueryResult *)result { EZOpenLinkButton *linkButton = [[EZOpenLinkButton alloc] init]; [self addSubview:linkButton]; - NSImage *linkImage = [NSImage ez_imageWithSymbolName:@"link"]; + NSImage *linkImage = [NSImage imageNamed:@"link"]; linkButton.image = linkImage; NSString *toolTip = NSLocalizedString(@"open_web_link", nil); diff --git a/Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m b/Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m index 407b3fe06..9f28372d5 100644 --- a/Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m +++ b/Easydict/Feature/ViewController/Window/BaseQueryWindow/EZBaseQueryViewController.m @@ -297,6 +297,7 @@ - (NSTableView *)tableView { tableView.style = NSTableViewStylePlain; } else { // Fallback on earlier versions + [tableView setHeaderView:nil]; } NSTableColumn *column = [[NSTableColumn alloc] initWithIdentifier:EZColumnId]; @@ -531,7 +532,6 @@ - (void)clearInput { [self.queryView setAlertTextHidden:YES]; [self.audioPlayer stop]; - ; } - (void)clearAll { diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 34a28fd09..3d68df0d8 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 60; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -16,6 +16,7 @@ dependencies = ( ); name = AppCenter; + productName = AppCenter; }; ED77B4B88587C894E85C361023D67C53 /* Sparkle */ = { isa = PBXAggregateTarget; @@ -25,6 +26,7 @@ dependencies = ( ); name = Sparkle; + productName = Sparkle; }; /* End PBXAggregateTarget section */ @@ -597,7 +599,7 @@ /* Begin PBXFileReference section */ 006BC20D4395D45987C4A1EB4D5A8D57 /* NSObject+RACDeallocating.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+RACDeallocating.m"; path = "ReactiveObjC/NSObject+RACDeallocating.m"; sourceTree = ""; }; 0246E4EB0700107D71054A99608C7A88 /* Shortcut.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Shortcut.h; path = Framework/Shortcut.h; sourceTree = ""; }; - 02E571AAD1834AE29CF2C2FBE66B687E /* mz_strm_wzaes.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_strm_wzaes.c; path = SSZipArchive/minizip/mz_strm_wzaes.c; sourceTree = ""; }; + 02E571AAD1834AE29CF2C2FBE66B687E /* mz_strm_wzaes.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_strm_wzaes.c; path = SSZipArchive/minizip/mz_strm_wzaes.c; sourceTree = ""; }; 0329D69E10BBD251DADDB018B2B2DFD8 /* SPUDownloader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SPUDownloader.h; path = Sparkle.framework/Versions/A/Headers/SPUDownloader.h; sourceTree = ""; }; 039285FF3F9CF501B595F059972CD7B6 /* DDLegacyMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDLegacyMacros.h; path = "Sources/CocoaLumberjack/Supporting Files/DDLegacyMacros.h"; sourceTree = ""; }; 0403A3CC88BCD7C46268BA4D8FB7CF40 /* Sparkle.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Sparkle.h; path = Sparkle.framework/Versions/A/Headers/Sparkle.h; sourceTree = ""; }; @@ -613,12 +615,12 @@ 07E2C8954E7CB0A0565D6A1B3DD6BB60 /* RACDelegateProxy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACDelegateProxy.m; path = ReactiveObjC/RACDelegateProxy.m; sourceTree = ""; }; 0876D158FA60295C5E543727FDF0C5E0 /* RACScopedDisposable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACScopedDisposable.h; path = ReactiveObjC/RACScopedDisposable.h; sourceTree = ""; }; 097C12C089CC15D8D6BFA5AE802ABCA0 /* NSObject+RACDescription.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+RACDescription.m"; path = "ReactiveObjC/NSObject+RACDescription.m"; sourceTree = ""; }; - 0BFA881E936496FE8EFEA1C0CFDDD9A8 /* ru.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = ru.lproj; path = Resources/ru.lproj; sourceTree = ""; }; + 0BFA881E936496FE8EFEA1C0CFDDD9A8 /* ru.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = ru.lproj; path = Resources/ru.lproj; sourceTree = ""; }; 0C3E1719789106F2F475992C4D7F4805 /* JLRoutes-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "JLRoutes-umbrella.h"; sourceTree = ""; }; - 0C928A190CAB1921BF142CD5E9EE3A4C /* es.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = es.lproj; path = Resources/es.lproj; sourceTree = ""; }; + 0C928A190CAB1921BF142CD5E9EE3A4C /* es.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = es.lproj; path = Resources/es.lproj; sourceTree = ""; }; 0C9937C4E18AD8E34A34A6F53FEE6F0D /* mz_crypt.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mz_crypt.h; path = SSZipArchive/minizip/mz_crypt.h; sourceTree = ""; }; 0D610BCDDE18DC2909FCA3135208FAB9 /* Pods-Easydict-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Easydict-dummy.m"; sourceTree = ""; }; - 0E2B41CEEFFAE04A818E414128165B82 /* mz_os_posix.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_os_posix.c; path = SSZipArchive/minizip/mz_os_posix.c; sourceTree = ""; }; + 0E2B41CEEFFAE04A818E414128165B82 /* mz_os_posix.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_os_posix.c; path = SSZipArchive/minizip/mz_os_posix.c; sourceTree = ""; }; 0EB7D8E39629E178F9DF1054DE7DBFAD /* MASShortcut-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "MASShortcut-Info.plist"; sourceTree = ""; }; 0F1C25F44128BF7424E93AA5262DC85E /* Pods-Easydict.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Easydict.release.xcconfig"; sourceTree = ""; }; 0F25A8A224181918772380FB6DA50657 /* SUAppcastItem.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SUAppcastItem.h; path = Sparkle.framework/Versions/A/Headers/SUAppcastItem.h; sourceTree = ""; }; @@ -633,7 +635,7 @@ 14165F1A82DB531B127F6BA19BB856CA /* MASShortcutValidator.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASShortcutValidator.m; path = Framework/Model/MASShortcutValidator.m; sourceTree = ""; }; 14EB1AEC4152E630A8FA235AD3A5E33A /* SSZipArchive.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SSZipArchive.modulemap; sourceTree = ""; }; 15BDC6F7F3CA9CD739B70E549E526C56 /* MASCompositeConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASCompositeConstraint.m; path = Masonry/MASCompositeConstraint.m; sourceTree = ""; }; - 165BDA4B05238521B9D3845DAF35C099 /* cs.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = cs.lproj; path = Resources/cs.lproj; sourceTree = ""; }; + 165BDA4B05238521B9D3845DAF35C099 /* cs.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = cs.lproj; path = Resources/cs.lproj; sourceTree = ""; }; 16CB565D691DE4D1A17A92A67B619971 /* NSString+MJExtension.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+MJExtension.m"; path = "MJExtension/NSString+MJExtension.m"; sourceTree = ""; }; 175220FB8ED1F45CD04360D1DC14450A /* MJProperty.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MJProperty.m; path = MJExtension/MJProperty.m; sourceTree = ""; }; 17669A4AE9F649D7D328C8CD840AFFCB /* mz_strm_wzaes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mz_strm_wzaes.h; path = SSZipArchive/minizip/mz_strm_wzaes.h; sourceTree = ""; }; @@ -648,7 +650,7 @@ 1A2D27DA4E6B9BC4DF6E5859FB91A3A8 /* NSNotificationCenter+RACSupport.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSNotificationCenter+RACSupport.m"; path = "ReactiveObjC/NSNotificationCenter+RACSupport.m"; sourceTree = ""; }; 1C62512514670C7B2EFB3B152A58F91E /* MJExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MJExtension.debug.xcconfig; sourceTree = ""; }; 1D9B55E8A97E89E005D11E5613D22E30 /* MASShortcut.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASShortcut.h; path = Framework/Model/MASShortcut.h; sourceTree = ""; }; - 1E3659287FD56CF105776182FC6B58AB /* pl.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = pl.lproj; path = Resources/pl.lproj; sourceTree = ""; }; + 1E3659287FD56CF105776182FC6B58AB /* pl.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = pl.lproj; path = Resources/pl.lproj; sourceTree = ""; }; 1E5E97588FFF9BFB0D5B988752F83FD1 /* NSObject+MJKeyValue.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+MJKeyValue.m"; path = "MJExtension/NSObject+MJKeyValue.m"; sourceTree = ""; }; 1E78C444B739E56B8E82DA9AA14A77D4 /* RACEvent.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACEvent.h; path = ReactiveObjC/RACEvent.h; sourceTree = ""; }; 1EE860FDAA6E55D72B59E6FA9925E229 /* RACStringSequence.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACStringSequence.m; path = ReactiveObjC/RACStringSequence.m; sourceTree = ""; }; @@ -659,11 +661,11 @@ 1FFED36A657123030ABB700256D73F15 /* Masonry */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Masonry; path = Masonry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2067EC04F8C03873368B4174A78991B5 /* mz_compat.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mz_compat.h; path = SSZipArchive/minizip/mz_compat.h; sourceTree = ""; }; 20F9F20C806B93C0CD45D3FAB5F185C2 /* SUUpdaterDelegate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SUUpdaterDelegate.h; path = Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h; sourceTree = ""; }; - 223522E1D1B6DDE5726C9C355FF263F0 /* zh-Hant.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = "zh-Hant.lproj"; path = "Resources/zh-Hant.lproj"; sourceTree = ""; }; + 223522E1D1B6DDE5726C9C355FF263F0 /* zh-Hant.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = "zh-Hant.lproj"; path = "Resources/zh-Hant.lproj"; sourceTree = ""; }; 225198CE18CF6D457A07FFA8E1635FD6 /* Pods-EasydictTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-EasydictTests.debug.xcconfig"; sourceTree = ""; }; 22D32117BA206D4DD08F82C9F946D770 /* DDLog+Combine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "DDLog+Combine.swift"; path = "Sources/CocoaLumberjackSwift/DDLog+Combine.swift"; sourceTree = ""; }; 230F8208BE63C052A548A7D41A1158B2 /* MASShortcut-MASShortcut */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "MASShortcut-MASShortcut"; path = MASShortcut.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - 241F77F457013EDCECA026B92AC303EB /* en.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = en.lproj; path = Resources/en.lproj; sourceTree = ""; }; + 241F77F457013EDCECA026B92AC303EB /* en.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = en.lproj; path = Resources/en.lproj; sourceTree = ""; }; 245D1D3F7FC1877A577F6EBC5739BD88 /* SSZipArchive-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SSZipArchive-dummy.m"; sourceTree = ""; }; 24831CA3EDD80C839B3D0996A9135DDD /* JLRoutes-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "JLRoutes-dummy.m"; sourceTree = ""; }; 2540D17AE0821CCCE54DDCC6839DD0D3 /* NSObject+RACLifting.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+RACLifting.m"; path = "ReactiveObjC/NSObject+RACLifting.m"; sourceTree = ""; }; @@ -678,38 +680,38 @@ 2A3AC1B447A7C22D41C4E06AA96B0DCD /* NSArray+MASAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSArray+MASAdditions.h"; path = "Masonry/NSArray+MASAdditions.h"; sourceTree = ""; }; 2ABDBC8DDF8940CE324AC9D9740788D1 /* RACIndexSetSequence.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACIndexSetSequence.m; path = ReactiveObjC/RACIndexSetSequence.m; sourceTree = ""; }; 2B276B0A79173A1D6E83C9B4FB9A4A57 /* MJExtension */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MJExtension; path = MJExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 2B6AD53F48555C3FB4C5BCCFEC381F46 /* mz_strm_buf.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_strm_buf.c; path = SSZipArchive/minizip/mz_strm_buf.c; sourceTree = ""; }; + 2B6AD53F48555C3FB4C5BCCFEC381F46 /* mz_strm_buf.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_strm_buf.c; path = SSZipArchive/minizip/mz_strm_buf.c; sourceTree = ""; }; 2D24C2A0993E0075F2E1EA84348B66D9 /* MASViewAttribute.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASViewAttribute.m; path = Masonry/MASViewAttribute.m; sourceTree = ""; }; 2D41E01B097D3097949D5B50070848C3 /* AFURLRequestSerialization.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLRequestSerialization.h; path = AFNetworking/AFURLRequestSerialization.h; sourceTree = ""; }; 2E1443A789EDE4103CD86669A9C19526 /* RACSubscriber+Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "RACSubscriber+Private.h"; path = "ReactiveObjC/RACSubscriber+Private.h"; sourceTree = ""; }; 2FEAC215BD1C565AFCA6E852ED715384 /* RACUnit.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACUnit.h; path = ReactiveObjC/RACUnit.h; sourceTree = ""; }; 300C85B8D76E668769E9A3E5E1DFA72D /* NSSet+RACSequenceAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSSet+RACSequenceAdditions.h"; path = "ReactiveObjC/NSSet+RACSequenceAdditions.h"; sourceTree = ""; }; 301E387AD1A13AED0DCADB3EA506D2EC /* RACDisposable.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACDisposable.h; path = ReactiveObjC/RACDisposable.h; sourceTree = ""; }; - 319E5809F9260B87679D45421B7C8A7C /* mz_crypt_apple.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_crypt_apple.c; path = SSZipArchive/minizip/mz_crypt_apple.c; sourceTree = ""; }; + 319E5809F9260B87679D45421B7C8A7C /* mz_crypt_apple.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_crypt_apple.c; path = SSZipArchive/minizip/mz_crypt_apple.c; sourceTree = ""; }; 3205F28CAA83F7682F2767179C6B81FF /* RACMulticastConnection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACMulticastConnection.h; path = ReactiveObjC/RACMulticastConnection.h; sourceTree = ""; }; 321BE5603CF123F71219A54130CB68CE /* RACScheduler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACScheduler.h; path = ReactiveObjC/RACScheduler.h; sourceTree = ""; }; - 32D6346A93682C978CAE151BF494795F /* RACSignalProvider.d */ = {isa = PBXFileReference; includeInIndex = 1; name = RACSignalProvider.d; path = ReactiveObjC/RACSignalProvider.d; sourceTree = ""; }; + 32D6346A93682C978CAE151BF494795F /* RACSignalProvider.d */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.dtrace; name = RACSignalProvider.d; path = ReactiveObjC/RACSignalProvider.d; sourceTree = ""; }; 3317F6C156EF75E8DF2463BADD1183F8 /* MASShortcut.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASShortcut.m; path = Framework/Model/MASShortcut.m; sourceTree = ""; }; 3483F61D81FBFCC9D840E9D96F1A86A4 /* AFNetworking.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFNetworking.h; path = AFNetworking/AFNetworking.h; sourceTree = ""; }; 3575A437EA833A8D8E226B31F3E38959 /* MJExtension-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MJExtension-prefix.pch"; sourceTree = ""; }; 359ABE3CE19CC1D810422038E67A5285 /* RACEvent.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACEvent.m; path = ReactiveObjC/RACEvent.m; sourceTree = ""; }; 35CAB6C32027756DDE55EED08D7E70DC /* NSObject+FBKVOController.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+FBKVOController.m"; path = "FBKVOController/NSObject+FBKVOController.m"; sourceTree = ""; }; - 368014F589429CC722013DF326BC8B52 /* AppCenterAnalytics.xcframework */ = {isa = PBXFileReference; includeInIndex = 1; name = AppCenterAnalytics.xcframework; path = "AppCenter-SDK-Apple/AppCenterAnalytics.xcframework"; sourceTree = ""; }; + 368014F589429CC722013DF326BC8B52 /* AppCenterAnalytics.xcframework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.xcframework; name = AppCenterAnalytics.xcframework; path = "AppCenter-SDK-Apple/AppCenterAnalytics.xcframework"; sourceTree = ""; }; 36A4A62A1CCA6B9F3C0381439421C36C /* Pods-EasydictTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-EasydictTests.modulemap"; sourceTree = ""; }; 37541FE1740936803FE62244AD32E81A /* MASShortcutValidator.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASShortcutValidator.h; path = Framework/Model/MASShortcutValidator.h; sourceTree = ""; }; - 3767DB31AF06623967462D1615BFCBD5 /* mz_strm_os_posix.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_strm_os_posix.c; path = SSZipArchive/minizip/mz_strm_os_posix.c; sourceTree = ""; }; + 3767DB31AF06623967462D1615BFCBD5 /* mz_strm_os_posix.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_strm_os_posix.c; path = SSZipArchive/minizip/mz_strm_os_posix.c; sourceTree = ""; }; 37DF82D73BC02F9708E607E649DE43BC /* View+MASShorthandAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "View+MASShorthandAdditions.h"; path = "Masonry/View+MASShorthandAdditions.h"; sourceTree = ""; }; 383DA4FE1857A99231912C882426C1F9 /* RACSubscriptionScheduler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACSubscriptionScheduler.m; path = ReactiveObjC/RACSubscriptionScheduler.m; sourceTree = ""; }; 3906AD4DF1E6F559AA77E8B9CE6C6075 /* Pods-EasydictTests-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-EasydictTests-Info.plist"; sourceTree = ""; }; 390E25987FECAF4AD1441FD0960B397D /* RACEXTRuntimeExtensions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACEXTRuntimeExtensions.m; path = ReactiveObjC/extobjc/RACEXTRuntimeExtensions.m; sourceTree = ""; }; - 398029207948204ED1D2FFAF511BAE5C /* mz_crypt.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_crypt.c; path = SSZipArchive/minizip/mz_crypt.c; sourceTree = ""; }; + 398029207948204ED1D2FFAF511BAE5C /* mz_crypt.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_crypt.c; path = SSZipArchive/minizip/mz_crypt.c; sourceTree = ""; }; 399EC9508E73C0D54D9BBD8741FBA137 /* KVOController */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = KVOController; path = KVOController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 39C5F33211187A192E2FD3541136C438 /* RACEagerSequence.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACEagerSequence.m; path = ReactiveObjC/RACEagerSequence.m; sourceTree = ""; }; 39DEA10A020619E59B4D13F1B9CECB6F /* SPUURLRequest.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SPUURLRequest.h; path = Sparkle.framework/Versions/A/Headers/SPUURLRequest.h; sourceTree = ""; }; 3A00C24EAE06650C3090F7DFE44879F8 /* DDAbstractDatabaseLogger.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDAbstractDatabaseLogger.h; path = Sources/CocoaLumberjack/include/CocoaLumberjack/DDAbstractDatabaseLogger.h; sourceTree = ""; }; 3A1F93FD082D49A5E1E0F76E693F353B /* MASLayoutConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASLayoutConstraint.m; path = Masonry/MASLayoutConstraint.m; sourceTree = ""; }; 3AD44090D6F3D30684FCF5EF8BCBB635 /* MASDictionaryTransformer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASDictionaryTransformer.h; path = "Framework/User Defaults Storage/MASDictionaryTransformer.h"; sourceTree = ""; }; - 3D8D230231C716940207E40C7EF03B48 /* de.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = de.lproj; path = Resources/de.lproj; sourceTree = ""; }; + 3D8D230231C716940207E40C7EF03B48 /* de.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = de.lproj; path = Resources/de.lproj; sourceTree = ""; }; 3D9B319ECC1B0CABA861D3863428D015 /* Masonry.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Masonry.h; path = Masonry/Masonry.h; sourceTree = ""; }; 3DF03B076AF8BA1477C5A4954AF132AE /* MASDictionaryTransformer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASDictionaryTransformer.m; path = "Framework/User Defaults Storage/MASDictionaryTransformer.m"; sourceTree = ""; }; 3E6ECC871A16CA575AA8AFAAEC737ABD /* RACStringSequence.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACStringSequence.h; path = ReactiveObjC/RACStringSequence.h; sourceTree = ""; }; @@ -719,7 +721,7 @@ 3F7FE8A890D1E281183FF8477282DBED /* NSString+RACSequenceAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+RACSequenceAdditions.m"; path = "ReactiveObjC/NSString+RACSequenceAdditions.m"; sourceTree = ""; }; 3F99655E48D8806A89110811A492D6EA /* JLRRouteHandler.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = JLRRouteHandler.m; path = JLRoutes/Classes/JLRRouteHandler.m; sourceTree = ""; }; 3FF8EDE12B9BD7B04AA13BF3780A4EB7 /* NSLayoutConstraint+MASDebugAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSLayoutConstraint+MASDebugAdditions.h"; path = "Masonry/NSLayoutConstraint+MASDebugAdditions.h"; sourceTree = ""; }; - 40E11C9B43A9907629DB6213DADB780C /* ja.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = ja.lproj; path = Resources/ja.lproj; sourceTree = ""; }; + 40E11C9B43A9907629DB6213DADB780C /* ja.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = ja.lproj; path = Resources/ja.lproj; sourceTree = ""; }; 410B25984097829CC3B1A1F15606FB8F /* DDContextFilterLogFormatter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDContextFilterLogFormatter.m; path = Sources/CocoaLumberjack/Extensions/DDContextFilterLogFormatter.m; sourceTree = ""; }; 41AAC62E73D8AFD5E2C3951B85E5DAB5 /* NSObject+RACAppKitBindings.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+RACAppKitBindings.m"; path = "ReactiveObjC/NSObject+RACAppKitBindings.m"; sourceTree = ""; }; 41C23F56145AC1F0979D25DBD176261D /* DDFileLogger+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "DDFileLogger+Internal.h"; path = "Sources/CocoaLumberjack/DDFileLogger+Internal.h"; sourceTree = ""; }; @@ -730,7 +732,7 @@ 429DC07D77CE24A366ADF807EF681139 /* MASConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASConstraint.m; path = Masonry/MASConstraint.m; sourceTree = ""; }; 43DA45C7D4BA6CFBE91D49586B19B6FE /* DDLoggerNames.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDLoggerNames.m; path = Sources/CocoaLumberjack/DDLoggerNames.m; sourceTree = ""; }; 43F9966E7614888A0CDCFAB2F62F2FDD /* MASPreferences */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = MASPreferences; path = MASPreferences.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 451EDE2019FE03D5FB370310D4793A5D /* mz_strm_pkcrypt.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_strm_pkcrypt.c; path = SSZipArchive/minizip/mz_strm_pkcrypt.c; sourceTree = ""; }; + 451EDE2019FE03D5FB370310D4793A5D /* mz_strm_pkcrypt.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_strm_pkcrypt.c; path = SSZipArchive/minizip/mz_strm_pkcrypt.c; sourceTree = ""; }; 45BDD1040544B36A259F8F2C0ABADA5D /* NSObject+MJCoding.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+MJCoding.m"; path = "MJExtension/NSObject+MJCoding.m"; sourceTree = ""; }; 45D5C6826805A9135A1E835F479CDBB6 /* NSControl+RACCommandSupport.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSControl+RACCommandSupport.m"; path = "ReactiveObjC/NSControl+RACCommandSupport.m"; sourceTree = ""; }; 45E9C38D4A9F9BD17630950BB2C95492 /* RACGroupedSignal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACGroupedSignal.h; path = ReactiveObjC/RACGroupedSignal.h; sourceTree = ""; }; @@ -777,7 +779,7 @@ 59875E87CF2E7B63A01DBE00CA2C807C /* SUAppcast.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SUAppcast.h; path = Sparkle.framework/Versions/A/Headers/SUAppcast.h; sourceTree = ""; }; 59B20D02E6A6BA7B70C5ECA3EC03F3A0 /* NSString+RACKeyPathUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+RACKeyPathUtilities.m"; path = "ReactiveObjC/NSString+RACKeyPathUtilities.m"; sourceTree = ""; }; 5A50950DBBD46C31608EC87CA21E4D58 /* MASShortcut-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MASShortcut-umbrella.h"; sourceTree = ""; }; - 5AFC2E6233F0D16D661FC84A2094AE4B /* mz_strm_mem.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_strm_mem.c; path = SSZipArchive/minizip/mz_strm_mem.c; sourceTree = ""; }; + 5AFC2E6233F0D16D661FC84A2094AE4B /* mz_strm_mem.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_strm_mem.c; path = SSZipArchive/minizip/mz_strm_mem.c; sourceTree = ""; }; 5B04C42BC8AC30B8C14A4456CFF6FAF6 /* NSObject+RACSelectorSignal.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+RACSelectorSignal.m"; path = "ReactiveObjC/NSObject+RACSelectorSignal.m"; sourceTree = ""; }; 5B77F3882996A4204A91A3C03F3B99B4 /* RACEmptySignal.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACEmptySignal.m; path = ReactiveObjC/RACEmptySignal.m; sourceTree = ""; }; 5C4D3C4DF3E8DCEA2AC9B1FC06C9238E /* View+MASAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "View+MASAdditions.m"; path = "Masonry/View+MASAdditions.m"; sourceTree = ""; }; @@ -797,7 +799,7 @@ 613A96697DF9F28C49470C423685E1BD /* NSObject+RACSelectorSignal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSObject+RACSelectorSignal.h"; path = "ReactiveObjC/NSObject+RACSelectorSignal.h"; sourceTree = ""; }; 6176F44B8A041F193E664E48590D9062 /* RACCommand.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACCommand.m; path = ReactiveObjC/RACCommand.m; sourceTree = ""; }; 61AE0E94C102F0B2C0843AAFE3FC759C /* Masonry-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Masonry-Info.plist"; sourceTree = ""; }; - 62D23BAAC610B9C94633151CEBE604F7 /* mz_strm_split.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_strm_split.c; path = SSZipArchive/minizip/mz_strm_split.c; sourceTree = ""; }; + 62D23BAAC610B9C94633151CEBE604F7 /* mz_strm_split.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_strm_split.c; path = SSZipArchive/minizip/mz_strm_split.c; sourceTree = ""; }; 6336F92FFB441B9E5AB626A5ED3ED811 /* MASPreferences-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "MASPreferences-dummy.m"; sourceTree = ""; }; 63F1A5B7CB33E1978025AA9133A64D18 /* NSControl+RACCommandSupport.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSControl+RACCommandSupport.h"; path = "ReactiveObjC/NSControl+RACCommandSupport.h"; sourceTree = ""; }; 64CC1C70D6F4CC1C5B5E3E732433AA5B /* DDMultiFormatter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDMultiFormatter.h; path = Sources/CocoaLumberjack/include/CocoaLumberjack/DDMultiFormatter.h; sourceTree = ""; }; @@ -818,7 +820,7 @@ 6ED4C7CB01FADFD43304744AC518517C /* SSZipArchive.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SSZipArchive.m; path = SSZipArchive/SSZipArchive.m; sourceTree = ""; }; 6F8E4BD470254B9D25ECFA42AD6CBFE3 /* DDAbstractDatabaseLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDAbstractDatabaseLogger.m; path = Sources/CocoaLumberjack/DDAbstractDatabaseLogger.m; sourceTree = ""; }; 6FB17B2A100419443647BE0BB2C9E802 /* AFURLResponseSerialization.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLResponseSerialization.h; path = AFNetworking/AFURLResponseSerialization.h; sourceTree = ""; }; - 707395060366476E68F7F9FC97D91424 /* fr.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = fr.lproj; path = Resources/fr.lproj; sourceTree = ""; }; + 707395060366476E68F7F9FC97D91424 /* fr.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = fr.lproj; path = Resources/fr.lproj; sourceTree = ""; }; 707557B5035D452590231F7473D04415 /* MASViewConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASViewConstraint.m; path = Masonry/MASViewConstraint.m; sourceTree = ""; }; 71169A7B02A30222D3082055FA9F2253 /* NSDictionary+RACSequenceAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+RACSequenceAdditions.h"; path = "ReactiveObjC/NSDictionary+RACSequenceAdditions.h"; sourceTree = ""; }; 720A77C5BBC304EA4F643C13DC8DC232 /* JLRoutes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JLRoutes.h; path = JLRoutes/JLRoutes.h; sourceTree = ""; }; @@ -842,12 +844,12 @@ 7F202F57B2E32C30773795E58E80EA8D /* MJFoundation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MJFoundation.h; path = MJExtension/MJFoundation.h; sourceTree = ""; }; 7F3EC4D50DB316D0F13CA1102CE6D523 /* DDFileLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDFileLogger.m; path = Sources/CocoaLumberjack/DDFileLogger.m; sourceTree = ""; }; 7F6FFC583323D43866D9576EC0669BD4 /* CLIColor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CLIColor.m; path = Sources/CocoaLumberjack/CLI/CLIColor.m; sourceTree = ""; }; - 7FAAD7A3EDA38A63CB18B37DA992FF9A /* RACCompoundDisposableProvider.d */ = {isa = PBXFileReference; includeInIndex = 1; name = RACCompoundDisposableProvider.d; path = ReactiveObjC/RACCompoundDisposableProvider.d; sourceTree = ""; }; + 7FAAD7A3EDA38A63CB18B37DA992FF9A /* RACCompoundDisposableProvider.d */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.dtrace; name = RACCompoundDisposableProvider.d; path = ReactiveObjC/RACCompoundDisposableProvider.d; sourceTree = ""; }; 8042273CFE854CE92532E91C6E77D441 /* mz_strm_mem.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mz_strm_mem.h; path = SSZipArchive/minizip/mz_strm_mem.h; sourceTree = ""; }; 80FEE3E6640E44E77B4C9C1FDE5B027A /* SSZipArchive-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SSZipArchive-prefix.pch"; sourceTree = ""; }; 812FF25A0356079866EEF4C6F26C7FBC /* MASPreferencesViewController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASPreferencesViewController.h; path = Framework/MASPreferencesViewController.h; sourceTree = ""; }; 8130D9C11714353C5CD7ED5ED8630D39 /* MJExtensionConst.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MJExtensionConst.m; path = MJExtension/MJExtensionConst.m; sourceTree = ""; }; - 81D9AF52C5AD006B435DF3F37F561A1E /* mz_zip.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_zip.c; path = SSZipArchive/minizip/mz_zip.c; sourceTree = ""; }; + 81D9AF52C5AD006B435DF3F37F561A1E /* mz_zip.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_zip.c; path = SSZipArchive/minizip/mz_zip.c; sourceTree = ""; }; 82A8790BA710209CC6DBD2C62C4687D6 /* ReactiveObjC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = ReactiveObjC.release.xcconfig; sourceTree = ""; }; 838268AD0FEA5FF3F4822E0984A0F36F /* CocoaLumberjack-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CocoaLumberjack-prefix.pch"; sourceTree = ""; }; 83F1ED3953842D96FD09614C970E1E46 /* JLRRouteDefinition.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JLRRouteDefinition.h; path = JLRoutes/Classes/JLRRouteDefinition.h; sourceTree = ""; }; @@ -884,7 +886,7 @@ 91B23470DEB9A986332BEB5034234BC7 /* SSZipArchive */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SSZipArchive; path = SSZipArchive.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 91DD03072E859E094E20D5D4739FA1D0 /* RACSubscriptingAssignmentTrampoline.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACSubscriptingAssignmentTrampoline.m; path = ReactiveObjC/RACSubscriptingAssignmentTrampoline.m; sourceTree = ""; }; 92A9A66FB6E6985D9C95544D0419497C /* KVOController.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = KVOController.modulemap; sourceTree = ""; }; - 930BE5785B97AC03D243595A03E1EF0E /* mz_zip_rw.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_zip_rw.c; path = SSZipArchive/minizip/mz_zip_rw.c; sourceTree = ""; }; + 930BE5785B97AC03D243595A03E1EF0E /* mz_zip_rw.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_zip_rw.c; path = SSZipArchive/minizip/mz_zip_rw.c; sourceTree = ""; }; 9312CC9A36808D0478AE8052EF3DF43A /* Pods-EasydictTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-EasydictTests-acknowledgements.plist"; sourceTree = ""; }; 93565D8535011BFBF88AFD2EBF8638B8 /* ReactiveObjC.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = ReactiveObjC.modulemap; sourceTree = ""; }; 93A7C897837148E8F43CDD5A86AF01CB /* RACKVOProxy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACKVOProxy.h; path = ReactiveObjC/RACKVOProxy.h; sourceTree = ""; }; @@ -910,7 +912,7 @@ 9B4352D1CD18BB2BDE8A51479B871C10 /* Pods-Easydict */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-Easydict"; path = Pods_Easydict.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9C16EB19D11772E6EF9BFCFF045028C3 /* RACEmptySequence.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACEmptySequence.h; path = ReactiveObjC/RACEmptySequence.h; sourceTree = ""; }; 9D635ACBDB58BEC168F692A7F0132B89 /* MASPreferences-MASPreferences */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "MASPreferences-MASPreferences"; path = MASPreferences.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9F77D1C1886102FD3FC5B2FF4D57FBAF /* NSText+RACSignalSupport.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSText+RACSignalSupport.h"; path = "ReactiveObjC/NSText+RACSignalSupport.h"; sourceTree = ""; }; A000FB19C76F877C589F3D80026214A0 /* KVOController-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "KVOController-dummy.m"; sourceTree = ""; }; A09571D687A89CA59DD760FA195EAC25 /* CocoaLumberjack.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = CocoaLumberjack.modulemap; sourceTree = ""; }; @@ -921,7 +923,7 @@ A23367A0A4D5DD91A26B26153BD20834 /* JLRoutes.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = JLRoutes.modulemap; sourceTree = ""; }; A254222BBA1955CCC5ECE5BFD685CA81 /* MASPreferences.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = MASPreferences.modulemap; sourceTree = ""; }; A26892D088465CAC46E2983AE19D4B2A /* MASConstraintMaker.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MASConstraintMaker.m; path = Masonry/MASConstraintMaker.m; sourceTree = ""; }; - A2735DE6CBFE63DF4CB7D89C71EFFA80 /* mz_compat.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_compat.c; path = SSZipArchive/minizip/mz_compat.c; sourceTree = ""; }; + A2735DE6CBFE63DF4CB7D89C71EFFA80 /* mz_compat.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_compat.c; path = SSZipArchive/minizip/mz_compat.c; sourceTree = ""; }; A2D2EDD4A1DFEE11C6B812AE906708F7 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; A36CB9F6BEF5D7193B366B119E9824F9 /* NSArray+RACSequenceAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSArray+RACSequenceAdditions.m"; path = "ReactiveObjC/NSArray+RACSequenceAdditions.m"; sourceTree = ""; }; A45F11F0883FE4EE3264F359CBB240FC /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/Carbon.framework; sourceTree = DEVELOPER_DIR; }; @@ -938,7 +940,7 @@ AB1A8FF457FC6F8A1BE32606F4A2EBE0 /* NSFileHandle+RACSupport.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSFileHandle+RACSupport.h"; path = "ReactiveObjC/NSFileHandle+RACSupport.h"; sourceTree = ""; }; AC193327426333AC7DAEF8F2F859C3E5 /* RACDynamicSignal.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACDynamicSignal.m; path = ReactiveObjC/RACDynamicSignal.m; sourceTree = ""; }; AD7F577B23E55A1A5A69ED911605EA6A /* MASPreferences-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "MASPreferences-prefix.pch"; sourceTree = ""; }; - AE7CE3CEAD77B2F0FECDBC57FEDCF3EA /* zh-Hans.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = "zh-Hans.lproj"; path = "Resources/zh-Hans.lproj"; sourceTree = ""; }; + AE7CE3CEAD77B2F0FECDBC57FEDCF3EA /* zh-Hans.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = "zh-Hans.lproj"; path = "Resources/zh-Hans.lproj"; sourceTree = ""; }; AF08A112A03F55794ADC154115417521 /* Masonry.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Masonry.debug.xcconfig; sourceTree = ""; }; AF447CD5750128A2EFAC09D6B5204177 /* RACSubscriptionScheduler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACSubscriptionScheduler.h; path = ReactiveObjC/RACSubscriptionScheduler.h; sourceTree = ""; }; AFC1E7590F1B60F81208CCA92D6442EE /* NSArray+MASAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSArray+MASAdditions.m"; path = "Masonry/NSArray+MASAdditions.m"; sourceTree = ""; }; @@ -952,7 +954,7 @@ B401DF76A4478D99A4FF8AAFA88028A6 /* MASShortcut.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MASShortcut.debug.xcconfig; sourceTree = ""; }; B49635A00398482E27143F65EA6D8DE3 /* DDAssert.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DDAssert.swift; path = Sources/CocoaLumberjackSwift/DDAssert.swift; sourceTree = ""; }; B611B16E0132E802B104421DEE7C329E /* JLRRouteResponse.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JLRRouteResponse.h; path = JLRoutes/Classes/JLRRouteResponse.h; sourceTree = ""; }; - B6E0CC498560582758E2BE6090E6C682 /* sv.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = sv.lproj; path = Resources/sv.lproj; sourceTree = ""; }; + B6E0CC498560582758E2BE6090E6C682 /* sv.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = sv.lproj; path = Resources/sv.lproj; sourceTree = ""; }; B73B615C2EDA7369C346043C9F3FCB56 /* AFNetworking-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "AFNetworking-dummy.m"; sourceTree = ""; }; B74E4C2489D0E94B5B4C7EAFD9F04DFD /* RACChannel.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACChannel.m; path = ReactiveObjC/RACChannel.m; sourceTree = ""; }; B75DC16CDFCB4984764DC62F6AE4BB8A /* RACSignal.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACSignal.m; path = ReactiveObjC/RACSignal.m; sourceTree = ""; }; @@ -960,7 +962,7 @@ B845C2ACCFEF00A5B6C2314BC9ACE0DD /* Pods-Easydict-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Easydict-umbrella.h"; sourceTree = ""; }; B850E397BD88833328EDF3B99E891AA2 /* RACChannel.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACChannel.h; path = ReactiveObjC/RACChannel.h; sourceTree = ""; }; B86B4AAB47DFB9C73D2476D317BE774E /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; }; - BB0033931DFB9AEBAD9FFCDD50412E4E /* mz_strm.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_strm.c; path = SSZipArchive/minizip/mz_strm.c; sourceTree = ""; }; + BB0033931DFB9AEBAD9FFCDD50412E4E /* mz_strm.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_strm.c; path = SSZipArchive/minizip/mz_strm.c; sourceTree = ""; }; BB505E49C087677F2654C9CA5A56DF60 /* NSEnumerator+RACSequenceAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSEnumerator+RACSequenceAdditions.h"; path = "ReactiveObjC/NSEnumerator+RACSequenceAdditions.h"; sourceTree = ""; }; BB54EA9A011AB14572C8BF257894D173 /* CocoaLumberjack.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CocoaLumberjack.release.xcconfig; sourceTree = ""; }; BC542FB11F11479D95AA450940DFBAB7 /* MJPropertyKey.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = MJPropertyKey.m; path = MJExtension/MJPropertyKey.m; sourceTree = ""; }; @@ -985,7 +987,7 @@ C7E51592D86D48A4D6638018E013CE00 /* DDASLLogCapture.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDASLLogCapture.m; path = Sources/CocoaLumberjack/DDASLLogCapture.m; sourceTree = ""; }; C80C37B99B0B18B4199FC174981EAEDD /* RACSignalSequence.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACSignalSequence.m; path = ReactiveObjC/RACSignalSequence.m; sourceTree = ""; }; C85857E205279B21DCC4B9DDA5137DA1 /* SSZipArchive.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SSZipArchive.release.xcconfig; sourceTree = ""; }; - C8C3D43C53CC6A562A4DA8920667E49B /* pt.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = pt.lproj; path = Resources/pt.lproj; sourceTree = ""; }; + C8C3D43C53CC6A562A4DA8920667E49B /* pt.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = pt.lproj; path = Resources/pt.lproj; sourceTree = ""; }; C914C0BA5DFD3C86A7FFFA225C25F849 /* JLRParsingUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = JLRParsingUtilities.m; path = JLRoutes/Classes/JLRParsingUtilities.m; sourceTree = ""; }; C92BDBB947539B95E37FD15E873B5839 /* RACImmediateScheduler.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACImmediateScheduler.h; path = ReactiveObjC/RACImmediateScheduler.h; sourceTree = ""; }; CA33119D7941DCB133DBFD43AC56EF39 /* RACSignal+Operations.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "RACSignal+Operations.h"; path = "ReactiveObjC/RACSignal+Operations.h"; sourceTree = ""; }; @@ -999,7 +1001,7 @@ CDC9073A677DC504BEFFE2664F618A12 /* KVOController-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "KVOController-Info.plist"; sourceTree = ""; }; CDFF6AFC7A95D1A6FE00F4C167B69598 /* MASLocalization.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASLocalization.h; path = Framework/UI/MASLocalization.h; sourceTree = ""; }; CE9638C1A92511FD39709EB6AC3A2F54 /* RACKVOProxy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACKVOProxy.m; path = ReactiveObjC/RACKVOProxy.m; sourceTree = ""; }; - CF842771D20674A67BAB5456D4043836 /* it.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = it.lproj; path = Resources/it.lproj; sourceTree = ""; }; + CF842771D20674A67BAB5456D4043836 /* it.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = it.lproj; path = Resources/it.lproj; sourceTree = ""; }; CFC2636CFDA709D88B48DF65FC7499C8 /* RACAnnotations.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACAnnotations.h; path = ReactiveObjC/RACAnnotations.h; sourceTree = ""; }; D08CD3247AD3548DE96FDB83FFC4637B /* RACSubject.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACSubject.h; path = ReactiveObjC/RACSubject.h; sourceTree = ""; }; D1C3E3D5C20768DE97E3B410AAAA9B04 /* RACSubscriber.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACSubscriber.m; path = ReactiveObjC/RACSubscriber.m; sourceTree = ""; }; @@ -1015,12 +1017,12 @@ DB88DDF15ED3CE4B27FDB6D84AF270F9 /* CLIColor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CLIColor.h; path = Sources/CocoaLumberjack/include/CocoaLumberjack/CLIColor.h; sourceTree = ""; }; DBB91DAA19FE554A3C454CC19F310564 /* RACArraySequence.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACArraySequence.m; path = ReactiveObjC/RACArraySequence.m; sourceTree = ""; }; DCAE0EEBB231B97845FA6BDC3D251562 /* RACSequence.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = RACSequence.h; path = ReactiveObjC/RACSequence.h; sourceTree = ""; }; - DD07E4F10A3AD9434826458398895D0C /* AppCenter.xcframework */ = {isa = PBXFileReference; includeInIndex = 1; name = AppCenter.xcframework; path = "AppCenter-SDK-Apple/AppCenter.xcframework"; sourceTree = ""; }; + DD07E4F10A3AD9434826458398895D0C /* AppCenter.xcframework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.xcframework; name = AppCenter.xcframework; path = "AppCenter-SDK-Apple/AppCenter.xcframework"; sourceTree = ""; }; DD31AD177440604286B58417216D0C15 /* NSString+RACSupport.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+RACSupport.m"; path = "ReactiveObjC/NSString+RACSupport.m"; sourceTree = ""; }; DE745136CA3F6C4369B67BFB2F7377C1 /* MASPreferences.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MASPreferences.debug.xcconfig; sourceTree = ""; }; DE7B8FD64D45241D856ACF1BB9DCDBBB /* FBKVOController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FBKVOController.h; path = FBKVOController/FBKVOController.h; sourceTree = ""; }; DE9DAF0597FA6215E4388DCE42D1CA39 /* DDASLLogCapture.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DDASLLogCapture.h; path = Sources/CocoaLumberjack/include/CocoaLumberjack/DDASLLogCapture.h; sourceTree = ""; }; - DF17A6EC0A3A3AA89E4A15335FD6473B /* mz_strm_zlib.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_strm_zlib.c; path = SSZipArchive/minizip/mz_strm_zlib.c; sourceTree = ""; }; + DF17A6EC0A3A3AA89E4A15335FD6473B /* mz_strm_zlib.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_strm_zlib.c; path = SSZipArchive/minizip/mz_strm_zlib.c; sourceTree = ""; }; DF78C3D5B21E911BE57E699C1709B69E /* JLRoutes.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = JLRoutes.m; path = JLRoutes/JLRoutes.m; sourceTree = ""; }; DF8AED850A42C55D3B95DEEE1DEDF3A6 /* mz_zip.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mz_zip.h; path = SSZipArchive/minizip/mz_zip.h; sourceTree = ""; }; E06FB1E5FEEDFD5F791C45AAF738B425 /* NSObject+MJKeyValue.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSObject+MJKeyValue.h"; path = "MJExtension/NSObject+MJKeyValue.h"; sourceTree = ""; }; @@ -1040,9 +1042,9 @@ E8B0D7DA696566BC0A7BF9BD7A48C1DE /* NSData+RACSupport.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSData+RACSupport.h"; path = "ReactiveObjC/NSData+RACSupport.h"; sourceTree = ""; }; E96829E22A7A1CBE2F9D2AF3EAAFE78A /* RACDynamicSequence.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACDynamicSequence.m; path = ReactiveObjC/RACDynamicSequence.m; sourceTree = ""; }; EA40943E094CACF6B3B069FA9B8CF8B6 /* NSIndexSet+RACSequenceAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSIndexSet+RACSequenceAdditions.h"; path = "ReactiveObjC/NSIndexSet+RACSequenceAdditions.h"; sourceTree = ""; }; - EA8ACC11C01409F73644957370D1E4E1 /* AppCenterCrashes.xcframework */ = {isa = PBXFileReference; includeInIndex = 1; name = AppCenterCrashes.xcframework; path = "AppCenter-SDK-Apple/AppCenterCrashes.xcframework"; sourceTree = ""; }; + EA8ACC11C01409F73644957370D1E4E1 /* AppCenterCrashes.xcframework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.xcframework; name = AppCenterCrashes.xcframework; path = "AppCenter-SDK-Apple/AppCenterCrashes.xcframework"; sourceTree = ""; }; EAA1B4B4BAF870ECAC7E442F99937470 /* mz_os.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mz_os.h; path = SSZipArchive/minizip/mz_os.h; sourceTree = ""; }; - EB05BEEBB111B12940F5BD6AF595EA09 /* mz_os.c */ = {isa = PBXFileReference; includeInIndex = 1; name = mz_os.c; path = SSZipArchive/minizip/mz_os.c; sourceTree = ""; }; + EB05BEEBB111B12940F5BD6AF595EA09 /* mz_os.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; name = mz_os.c; path = SSZipArchive/minizip/mz_os.c; sourceTree = ""; }; EC9606B0C58D12D5509114AE3853DAA2 /* AFNetworking-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "AFNetworking-Info.plist"; sourceTree = ""; }; ED618FF4B0DA83EC02981328D8D41851 /* MASPreferencesWindowController.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASPreferencesWindowController.h; path = Framework/MASPreferencesWindowController.h; sourceTree = ""; }; ED83345F5665F9412344D3C68F7FF92E /* RACValueTransformer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACValueTransformer.m; path = ReactiveObjC/RACValueTransformer.m; sourceTree = ""; }; @@ -1064,7 +1066,7 @@ F8BB34FA96938FC7B8A53EC6852A50F8 /* Sparkle.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Sparkle.release.xcconfig; sourceTree = ""; }; F8EF8E81812FD628D55319A0BB8825DE /* SUUpdater.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SUUpdater.h; path = Sparkle.framework/Versions/A/Headers/SUUpdater.h; sourceTree = ""; }; F9BD34BBC9324675765A48ED03DD3537 /* SUCodeSigningVerifier.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SUCodeSigningVerifier.h; path = Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h; sourceTree = ""; }; - FA41C1B743DF23E1AC9AC3FF65966AD5 /* ko.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = ko.lproj; path = Resources/ko.lproj; sourceTree = ""; }; + FA41C1B743DF23E1AC9AC3FF65966AD5 /* ko.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = ko.lproj; path = Resources/ko.lproj; sourceTree = ""; }; FA772B81CC29726EC1432815891DEBD4 /* SPUDownloaderProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SPUDownloaderProtocol.h; path = Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h; sourceTree = ""; }; FA8CC00EEAE14D71F9CECB74FC6C3363 /* NSObject+RACPropertySubscribing.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSObject+RACPropertySubscribing.m"; path = "ReactiveObjC/NSObject+RACPropertySubscribing.m"; sourceTree = ""; }; FB150F5EEA53D6435E8D9C89000E60F5 /* MASKeyMasks.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASKeyMasks.h; path = Framework/Model/MASKeyMasks.h; sourceTree = ""; }; @@ -1072,7 +1074,7 @@ FB7D2744C70B654BEE21F84F1B6B2C8D /* DDOSLogger.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DDOSLogger.m; path = Sources/CocoaLumberjack/DDOSLogger.m; sourceTree = ""; }; FCDA4978023331E285CB91616BC15165 /* MASShortcutMonitor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MASShortcutMonitor.h; path = Framework/Monitoring/MASShortcutMonitor.h; sourceTree = ""; }; FD02F7D7F2FF7474555F7347C91BD1E2 /* SUVersionComparisonProtocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SUVersionComparisonProtocol.h; path = Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h; sourceTree = ""; }; - FD1450BC4B91EFC53F5B4D50150792A2 /* nl.lproj */ = {isa = PBXFileReference; includeInIndex = 1; name = nl.lproj; path = Resources/nl.lproj; sourceTree = ""; }; + FD1450BC4B91EFC53F5B4D50150792A2 /* nl.lproj */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = nl.lproj; path = Resources/nl.lproj; sourceTree = ""; }; FDAC33DA1B554ABF5057204E6CDF7417 /* MASShortcut.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = MASShortcut.release.xcconfig; sourceTree = ""; }; FE0C12880BB99F8D6F01013DE442BB19 /* RACSequence.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = RACSequence.m; path = ReactiveObjC/RACSequence.m; sourceTree = ""; }; FF54DA635324BFE7C16B888752811F2B /* MASConstraint+Private.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "MASConstraint+Private.h"; path = "Masonry/MASConstraint+Private.h"; sourceTree = ""; }; @@ -1325,7 +1327,6 @@ 433D81435AF93FDF28F24C6BE9430277 /* Frameworks */, C023F432FA0B0CC3F69C44900353E5F2 /* Support Files */, ); - name = Sparkle; path = Sparkle; sourceTree = ""; }; @@ -1381,7 +1382,6 @@ 5CA7D0B7E904C6CED9EB98DDDE08BE50 /* Resources */, 53C582560F4E0E505BC725F064075705 /* Support Files */, ); - name = MASShortcut; path = MASShortcut; sourceTree = ""; }; @@ -1578,7 +1578,6 @@ BCB6B157B3E75CA426F29A971CF9CF87 /* ReactiveObjC.h */, 653D856C9068694F9931A940D9EC5E2C /* Support Files */, ); - name = ReactiveObjC; path = ReactiveObjC; sourceTree = ""; }; @@ -1695,7 +1694,6 @@ 16CB565D691DE4D1A17A92A67B619971 /* NSString+MJExtension.m */, 8D3A26B11B94AA5D16EA1912B771E6AF /* Support Files */, ); - name = MJExtension; path = MJExtension; sourceTree = ""; }; @@ -1709,7 +1707,6 @@ 6342B910258CE595B3C805CB639B2CB4 /* Serialization */, AC609DCBF1F733D277AA596518B8D4A9 /* Support Files */, ); - name = AFNetworking; path = AFNetworking; sourceTree = ""; }; @@ -1723,7 +1720,6 @@ 35CAB6C32027756DDE55EED08D7E70DC /* NSObject+FBKVOController.m */, DF519FEFA4A216FF0709BB85275BD4EE /* Support Files */, ); - name = KVOController; path = KVOController; sourceTree = ""; }; @@ -1826,7 +1822,6 @@ 48CC0F6B87F630CDE54EFBE9C91A84C4 /* Support Files */, 552533086B292E3EB95456E57B153719 /* Swift */, ); - name = CocoaLumberjack; path = CocoaLumberjack; sourceTree = ""; }; @@ -1868,7 +1863,6 @@ 3F4B3C89A74B934772A6F2C57FE9D9FE /* ZipArchive.h */, 7543CBA458C98ECAA54859E09E5E030C /* Support Files */, ); - name = SSZipArchive; path = SSZipArchive; sourceTree = ""; }; @@ -1919,7 +1913,6 @@ A610D8F4DC3FA958D7C0DF0384442F5F /* JLRRouteResponse.m */, 17DE1A614F0AFE47C33F8FC293FFA0D7 /* Support Files */, ); - name = JLRoutes; path = JLRoutes; sourceTree = ""; }; @@ -1940,7 +1933,6 @@ 21EB88D3D9D0D21A096EB0F4C270E1E1 /* Crashes */, C6B173AF446B0C0587DB61E11654B09F /* Support Files */, ); - name = AppCenter; path = AppCenter; sourceTree = ""; }; @@ -2025,7 +2017,6 @@ 3AFA2063330758F083AFB14883812BC7 /* Resources */, F205C574AE9BA8FB8451E1962665B992 /* Support Files */, ); - name = MASPreferences; path = MASPreferences; sourceTree = ""; }; @@ -2059,7 +2050,6 @@ 4D639C2E0E9B578494D44D8E7FC873D9 /* ViewController+MASAdditions.m */, 8AF7D53FCE47620EA0BB7BABF395DB89 /* Support Files */, ); - name = Masonry; path = Masonry; sourceTree = ""; }; @@ -2651,7 +2641,7 @@ LastUpgradeCheck = 1500; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; - compatibilityVersion = "Xcode 15.0"; + compatibilityVersion = "Xcode 12.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -3350,6 +3340,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3959,6 +3950,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES;