⚡ Release 1.17.1 (parse-community#1279)

* Fixes issue affecting queries and results * Bumps version to 1.17.1 * Better fix * Mark properties readonly as never overwritten * nit * Update test for mutableCopy * Bump cocoapods
abeticlairon · Mar 20, 2018 · b10ccc4 · b10ccc4
1 parent 7c22670
commit b10ccc4
Show file tree

Hide file tree

Showing 26 changed files with 95 additions and 92 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,8 +17,6 @@ jobs:
       env: Deployment
       install: bundle install
       script:
-      - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-2
-      - bundle exec rake test:deployment
       - ./Scripts/jazzy.sh
       - xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-0
       - bundle exec rake package:release

diff --git a/Gemfile b/Gemfile
@@ -5,5 +5,5 @@ gem 'plist'
 gem 'naturally', '~> 1.3.2'
 gem 'xcpretty'
 gem 'xcodeproj'
-gem 'cocoapods'
+gem 'cocoapods', '~> 1.4.0'
 gem 'jazzy', '~> 0.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,54 +1,56 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.5)
-    activesupport (4.2.7.1)
+    CFPropertyList (2.3.6)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (1.0.1)
-    cocoapods (1.2.0)
+    atomos (0.1.2)
+    claide (1.0.2)
+    cocoapods (1.4.0)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.2.0)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.4.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
       cocoapods-downloader (>= 1.1.3, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.1.2, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.5)
+      molinillo (~> 0.6.4)
       nap (~> 1.0)
-      ruby-macho (~> 0.2.5)
-      xcodeproj (>= 1.4.1, < 2.0)
-    cocoapods-core (1.2.0)
-      activesupport (>= 4.0.2, < 5)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.5.4, < 2.0)
+    cocoapods-core (1.4.0)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
+    cocoapods-deintegrate (1.0.2)
     cocoapods-downloader (1.1.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.2)
+    cocoapods-trunk (1.3.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
-    colored (1.2)
+    colored2 (3.1.2)
+    concurrent-ruby (1.0.5)
     escape (0.0.4)
     ffi (1.9.18)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.3)
-    i18n (0.8.0)
+    gh_inspector (1.1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     jazzy (0.9.0)
       cocoapods (~> 1.0)
       mustache (~> 0.99)
@@ -58,15 +60,14 @@ GEM
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    json (1.8.6)
     liferaft (0.0.6)
-    minitest (5.10.1)
-    molinillo (0.5.6)
+    minitest (5.11.3)
+    molinillo (0.6.4)
     mustache (0.99.8)
     nanaimo (0.2.3)
     nap (1.1.0)
     naturally (1.3.2)
-    netrc (0.7.8)
+    netrc (0.11.0)
     open4 (1.3.4)
     plist (3.2.0)
     rake (11.2.2)
@@ -75,23 +76,23 @@ GEM
       ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
     rouge (1.11.1)
-    ruby-macho (0.2.6)
+    ruby-macho (1.1.0)
     sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     sqlite3 (1.3.13)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.4.2)
+    xcodeproj (1.5.6)
       CFPropertyList (~> 2.3.3)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
+      atomos (~> 0.1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
     xcpretty (0.2.2)
       rouge (~> 1.8)
@@ -100,7 +101,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (~> 1.4.0)
   jazzy (~> 0.9.0)
   naturally (~> 1.3.2)
   plist
@@ -109,4 +110,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/Parse.podspec b/Parse.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Parse'
-  s.version          = '1.17.0'
+  s.version          = '1.17.1'
   s.license          =  { :type => 'BSD', :file => 'LICENSE' }
   s.homepage         = 'http://parseplatform.org/'
   s.summary          = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'

diff --git a/Parse/Parse/Internal/ACL/State/PFMutableACLState.h b/Parse/Parse/Internal/ACL/State/PFMutableACLState.h
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface PFMutableACLState : PFACLState
 
-@property (nonatomic, copy, readwrite) NSMutableDictionary<NSString *, id> *permissions;
+@property (nonatomic, copy, readonly) NSMutableDictionary<NSString *, id> *permissions;
 @property (nonatomic, assign, readwrite, getter=isShared) BOOL shared;
 
 @end

diff --git a/Parse/Parse/Internal/Relation/State/PFMutableRelationState.h b/Parse/Parse/Internal/Relation/State/PFMutableRelationState.h
@@ -13,7 +13,7 @@
 
 @property (nonatomic, weak, readwrite) PFObject *parent;
 @property (nonatomic, copy, readwrite) NSString *targetClass;
-@property (nonatomic, copy, readwrite) NSMutableSet *knownObjects;
+@property (nonatomic, copy, readonly) NSMutableSet *knownObjects;
 @property (nonatomic, copy, readwrite) NSString *key;
 
 @end
diff --git a/Parse/Parse/PFConstants.h b/Parse/Parse/PFConstants.h
@@ -13,7 +13,7 @@
 #pragma mark - SDK Version
 ///--------------------------------------
 
-#define PARSE_VERSION @"1.17.0"
+#define PARSE_VERSION @"1.17.1"
 
 ///--------------------------------------
 #pragma mark - Platform

diff --git a/Parse/Parse/PFQuery.m b/Parse/Parse/PFQuery.m
@@ -752,16 +752,15 @@ - (BFTask *)_findObjectsAsyncForQueryState:(PFQueryState *)queryState after:(BFT
     BFTask *start = (previous ?: [BFTask taskWithResult:nil]);
 
     [self _validateQueryState];
+    Class selfClass = [self class];
     @weakify(self);
     return [[[start continueWithBlock:^id(BFTask *task) {
-        @strongify(self);
-        return [[self class] _getCurrentUserForQueryState:queryState];
+        return [selfClass _getCurrentUserForQueryState:queryState];
     }] continueWithBlock:^id(BFTask *task) {
-        @strongify(self);
         PFUser *user = task.result;
-        return [[[self class] queryController] findObjectsAsyncForQueryState:queryState
-                                                       withCancellationToken:cancellationTokenSource.token
-                                                                        user:user];
+        return [[selfClass queryController] findObjectsAsyncForQueryState:queryState
+                                                   withCancellationToken:cancellationTokenSource.token
+                                                                    user:user];
     }] continueWithBlock:^id(BFTask *task) {
         @strongify(self);
         if (!self) {
@@ -856,16 +855,20 @@ - (BFTask *)_countObjectsAsyncForQueryState:(PFQueryState *)queryState after:(BF
     BFTask *start = (previousTask ?: [BFTask taskWithResult:nil]);
 
     [self _validateQueryState];
+    Class selfClass = [self class];
     @weakify(self);
     return [[[start continueWithBlock:^id(BFTask *task) {
-        return [[self class] _getCurrentUserForQueryState:queryState];
+        return [selfClass _getCurrentUserForQueryState:queryState];
     }] continueWithBlock:^id(BFTask *task) {
-        @strongify(self);
         PFUser *user = task.result;
-        return [[[self class] queryController] countObjectsAsyncForQueryState:queryState
+        return [[selfClass queryController] countObjectsAsyncForQueryState:queryState
                                                         withCancellationToken:cancellationTokenSource.token
                                                                          user:user];
     }] continueWithBlock:^id(BFTask *task) {
+        @strongify(self);
+        if (!self) {
+            return task;
+        }
         @synchronized(self) {
             if (self->_cancellationTokenSource == cancellationTokenSource) {
                 self->_cancellationTokenSource = nil;

diff --git a/Parse/Parse/Resources/Parse-OSX.Info.plist b/Parse/Parse/Resources/Parse-OSX.Info.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 </dict>
 </plist>
diff --git a/Parse/Parse/Resources/Parse-iOS.Info.plist b/Parse/Parse/Resources/Parse-iOS.Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>MinimumOSVersion</key>
 	<string>6.0</string>
 </dict>

diff --git a/Parse/Parse/Resources/Parse-tvOS.Info.plist b/Parse/Parse/Resources/Parse-tvOS.Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/Parse/Parse/Resources/Parse-watchOS.Info.plist b/Parse/Parse/Resources/Parse-watchOS.Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/Parse/Tests/Unit/RelationStateTests.m b/Parse/Tests/Unit/RelationStateTests.m
@@ -83,7 +83,8 @@ - (void)testCopying {
 
 - (void)testMutableCopy {
     PFMutableRelationState *sampleState = [[self sampleRelationStateWithParent:nil] mutableCopy];
-    sampleState.knownObjects = [NSMutableSet setWithObjects:@1, nil];
+    [sampleState.knownObjects removeAllObjects];
+    [sampleState.knownObjects addObject:@"1"];
 
     XCTAssertEqualObjects([sampleState mutableCopy], sampleState);
 }

diff --git a/ParseFacebookUtils/Resources/Info-iOS.plist b/ParseFacebookUtils/Resources/Info-iOS.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>MinimumOSVersion</key>
 	<string>6.0</string>
 </dict>

diff --git a/ParseFacebookUtils/Resources/Info-tvOS.plist b/ParseFacebookUtils/Resources/Info-tvOS.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 </dict>
 </plist>
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSMainNibFile</key>

diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSMainNibFile</key>

diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.0</string>
+	<string>1.17.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>