Merge pull request #972 from ParsePlatform/nlutsenko.dependencies

Update all dependencies.

Author: nlutsenko

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "BoltsFramework/Bolts-ObjC" "1.8.3"
+github "BoltsFramework/Bolts-ObjC" "1.8.4"
 github "erikdoe/OCMock" "v3.3.1"

Carthage/Checkouts/Bolts-ObjC

@@ -29,15 +29,15 @@ GEM
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.0)
-    cocoapods-downloader (1.0.1)
+    cocoapods-downloader (1.1.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
     cocoapods-trunk (1.0.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (1.0.0)
+    cocoapods-try (1.1.0)
     colored (1.2)
     concurrent-ruby (1.0.2)
     escape (0.0.4)
@@ -55,7 +55,7 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (1.1.0)
+    xcodeproj (1.2.0)
       activesupport (>= 3)
       claide (>= 1.0.0, < 2.0)
       colored (~> 1.2)

Gemfile.lock

@@ -13,16 +13,14 @@
 #import "PFMutableFileState.h"
 #import "PFPropertyInfo.h"
 
-static NSString *const _PFFileStateSecureDomain = @"files.parsetfss.com";
-
-@interface PFFileState ()
+NS_ASSUME_NONNULL_BEGIN
 
-@property (nonatomic, copy, readwrite) NSString *secureURLString;
-
-@end
+static NSString *const _PFFileStateSecureDomain = @"files.parsetfss.com";
 
 @implementation PFFileState
 
+@synthesize secureURLString = _secureURLString;
+
 ///--------------------------------------
 #pragma mark - PFBaseStateSubclass
 ///--------------------------------------
@@ -41,7 +39,9 @@ - (instancetype)initWithState:(PFFileState *)state {
     return [super initWithState:state];
 }
 
-- (instancetype)initWithName:(NSString *)name urlString:(NSString *)urlString mimeType:(NSString *)mimeType {
+- (instancetype)initWithName:(nullable NSString *)name
+                   urlString:(nullable NSString *)urlString
+                    mimeType:(nullable NSString *)mimeType {
     self = [super init];
     if (!self) return nil;
 
@@ -56,14 +56,14 @@ - (instancetype)initWithName:(NSString *)name urlString:(NSString *)urlString mi
 #pragma mark - Accessors
 ///--------------------------------------
 
-- (void)setUrlString:(NSString *)urlString {
+- (void)setUrlString:(nullable NSString *)urlString {
     if (self.urlString != urlString) {
         _urlString = [urlString copy];
         _secureURLString = nil; // Invalidate variable cache
     }
 }
 
-- (NSString *)secureURLString {
+- (nullable NSString *)secureURLString {
     if (_secureURLString) {
         return _secureURLString;
     }
@@ -93,12 +93,14 @@ - (NSString *)secureURLString {
 #pragma mark - Mutable Copying
 ///--------------------------------------
 
-- (id)copyWithZone:(NSZone *)zone {
+- (id)copyWithZone:(nullable NSZone *)zone {
     return [[PFFileState allocWithZone:zone] initWithState:self];
 }
 
-- (instancetype)mutableCopyWithZone:(NSZone *)zone {
+- (instancetype)mutableCopyWithZone:(nullable NSZone *)zone {
     return [[PFMutableFileState allocWithZone:zone] initWithState:self];
 }
 
 @end
+
+NS_ASSUME_NONNULL_END

Parse/Internal/File/State/PFFileState.m

@@ -9,10 +9,14 @@
 
 #import "PFMutableFileState.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation PFMutableFileState
 
 @dynamic name;
 @dynamic urlString;
 @dynamic mimeType;
 
 @end
+
+NS_ASSUME_NONNULL_END