Skip to content

Commit b10ccc4

Browse files
authored
⚡ Release 1.17.1 (#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
1 parent 7c22670 commit b10ccc4

File tree

26 files changed

+95
-92
lines changed

26 files changed

+95
-92
lines changed

.travis.yml

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
env: Deployment
1818
install: bundle install
1919
script:
20-
- xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-2
21-
- bundle exec rake test:deployment
2220
- ./Scripts/jazzy.sh
2321
- xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-0
2422
- bundle exec rake package:release

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ gem 'plist'
55
gem 'naturally', '~> 1.3.2'
66
gem 'xcpretty'
77
gem 'xcodeproj'
8-
gem 'cocoapods'
8+
gem 'cocoapods', '~> 1.4.0'
99
gem 'jazzy', '~> 0.9.0'

Gemfile.lock

+35-34
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,56 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.5)
5-
activesupport (4.2.7.1)
4+
CFPropertyList (2.3.6)
5+
activesupport (4.2.10)
66
i18n (~> 0.7)
7-
json (~> 1.7, >= 1.7.7)
87
minitest (~> 5.1)
98
thread_safe (~> 0.3, >= 0.3.4)
109
tzinfo (~> 1.1)
11-
claide (1.0.1)
12-
cocoapods (1.2.0)
10+
atomos (0.1.2)
11+
claide (1.0.2)
12+
cocoapods (1.4.0)
1313
activesupport (>= 4.0.2, < 5)
14-
claide (>= 1.0.1, < 2.0)
15-
cocoapods-core (= 1.2.0)
16-
cocoapods-deintegrate (>= 1.0.1, < 2.0)
14+
claide (>= 1.0.2, < 2.0)
15+
cocoapods-core (= 1.4.0)
16+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
1717
cocoapods-downloader (>= 1.1.3, < 2.0)
1818
cocoapods-plugins (>= 1.0.0, < 2.0)
1919
cocoapods-search (>= 1.0.0, < 2.0)
2020
cocoapods-stats (>= 1.0.0, < 2.0)
21-
cocoapods-trunk (>= 1.1.2, < 2.0)
21+
cocoapods-trunk (>= 1.3.0, < 2.0)
2222
cocoapods-try (>= 1.1.0, < 2.0)
23-
colored (~> 1.2)
23+
colored2 (~> 3.1)
2424
escape (~> 0.0.4)
2525
fourflusher (~> 2.0.1)
2626
gh_inspector (~> 1.0)
27-
molinillo (~> 0.5.5)
27+
molinillo (~> 0.6.4)
2828
nap (~> 1.0)
29-
ruby-macho (~> 0.2.5)
30-
xcodeproj (>= 1.4.1, < 2.0)
31-
cocoapods-core (1.2.0)
32-
activesupport (>= 4.0.2, < 5)
29+
ruby-macho (~> 1.1)
30+
xcodeproj (>= 1.5.4, < 2.0)
31+
cocoapods-core (1.4.0)
32+
activesupport (>= 4.0.2, < 6)
3333
fuzzy_match (~> 2.0.4)
3434
nap (~> 1.0)
35-
cocoapods-deintegrate (1.0.1)
35+
cocoapods-deintegrate (1.0.2)
3636
cocoapods-downloader (1.1.3)
3737
cocoapods-plugins (1.0.0)
3838
nap
3939
cocoapods-search (1.0.0)
4040
cocoapods-stats (1.0.0)
41-
cocoapods-trunk (1.1.2)
41+
cocoapods-trunk (1.3.0)
4242
nap (>= 0.8, < 2.0)
43-
netrc (= 0.7.8)
43+
netrc (~> 0.11)
4444
cocoapods-try (1.1.0)
45-
colored (1.2)
45+
colored2 (3.1.2)
46+
concurrent-ruby (1.0.5)
4647
escape (0.0.4)
4748
ffi (1.9.18)
4849
fourflusher (2.0.1)
4950
fuzzy_match (2.0.4)
50-
gh_inspector (1.0.3)
51-
i18n (0.8.0)
51+
gh_inspector (1.1.3)
52+
i18n (0.9.5)
53+
concurrent-ruby (~> 1.0)
5254
jazzy (0.9.0)
5355
cocoapods (~> 1.0)
5456
mustache (~> 0.99)
@@ -58,15 +60,14 @@ GEM
5860
sass (~> 3.4)
5961
sqlite3 (~> 1.3)
6062
xcinvoke (~> 0.3.0)
61-
json (1.8.6)
6263
liferaft (0.0.6)
63-
minitest (5.10.1)
64-
molinillo (0.5.6)
64+
minitest (5.11.3)
65+
molinillo (0.6.4)
6566
mustache (0.99.8)
6667
nanaimo (0.2.3)
6768
nap (1.1.0)
6869
naturally (1.3.2)
69-
netrc (0.7.8)
70+
netrc (0.11.0)
7071
open4 (1.3.4)
7172
plist (3.2.0)
7273
rake (11.2.2)
@@ -75,23 +76,23 @@ GEM
7576
ffi (>= 0.5.0, < 2)
7677
redcarpet (3.4.0)
7778
rouge (1.11.1)
78-
ruby-macho (0.2.6)
79+
ruby-macho (1.1.0)
7980
sass (3.5.3)
8081
sass-listen (~> 4.0.0)
8182
sass-listen (4.0.0)
8283
rb-fsevent (~> 0.9, >= 0.9.4)
8384
rb-inotify (~> 0.9, >= 0.9.7)
8485
sqlite3 (1.3.13)
85-
thread_safe (0.3.5)
86-
tzinfo (1.2.2)
86+
thread_safe (0.3.6)
87+
tzinfo (1.2.5)
8788
thread_safe (~> 0.1)
8889
xcinvoke (0.3.0)
8990
liferaft (~> 0.0.6)
90-
xcodeproj (1.4.2)
91+
xcodeproj (1.5.6)
9192
CFPropertyList (~> 2.3.3)
92-
activesupport (>= 3)
93-
claide (>= 1.0.1, < 2.0)
94-
colored (~> 1.2)
93+
atomos (~> 0.1.2)
94+
claide (>= 1.0.2, < 2.0)
95+
colored2 (~> 3.1)
9596
nanaimo (~> 0.2.3)
9697
xcpretty (0.2.2)
9798
rouge (~> 1.8)
@@ -100,7 +101,7 @@ PLATFORMS
100101
ruby
101102

102103
DEPENDENCIES
103-
cocoapods
104+
cocoapods (~> 1.4.0)
104105
jazzy (~> 0.9.0)
105106
naturally (~> 1.3.2)
106107
plist
@@ -109,4 +110,4 @@ DEPENDENCIES
109110
xcpretty
110111

111112
BUNDLED WITH
112-
1.16.0
113+
1.16.1

Parse.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Parse'
3-
s.version = '1.17.0'
3+
s.version = '1.17.1'
44
s.license = { :type => 'BSD', :file => 'LICENSE' }
55
s.homepage = 'http://parseplatform.org/'
66
s.summary = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'

Parse/Parse/Internal/ACL/State/PFMutableACLState.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
1313

1414
@interface PFMutableACLState : PFACLState
1515

16-
@property (nonatomic, copy, readwrite) NSMutableDictionary<NSString *, id> *permissions;
16+
@property (nonatomic, copy, readonly) NSMutableDictionary<NSString *, id> *permissions;
1717
@property (nonatomic, assign, readwrite, getter=isShared) BOOL shared;
1818

1919
@end

Parse/Parse/Internal/Relation/State/PFMutableRelationState.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@property (nonatomic, weak, readwrite) PFObject *parent;
1515
@property (nonatomic, copy, readwrite) NSString *targetClass;
16-
@property (nonatomic, copy, readwrite) NSMutableSet *knownObjects;
16+
@property (nonatomic, copy, readonly) NSMutableSet *knownObjects;
1717
@property (nonatomic, copy, readwrite) NSString *key;
1818

1919
@end

Parse/Parse/PFConstants.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#pragma mark - SDK Version
1414
///--------------------------------------
1515

16-
#define PARSE_VERSION @"1.17.0"
16+
#define PARSE_VERSION @"1.17.1"
1717

1818
///--------------------------------------
1919
#pragma mark - Platform

Parse/Parse/PFQuery.m

+12-9
Original file line numberDiff line numberDiff line change
@@ -752,16 +752,15 @@ - (BFTask *)_findObjectsAsyncForQueryState:(PFQueryState *)queryState after:(BFT
752752
BFTask *start = (previous ?: [BFTask taskWithResult:nil]);
753753

754754
[self _validateQueryState];
755+
Class selfClass = [self class];
755756
@weakify(self);
756757
return [[[start continueWithBlock:^id(BFTask *task) {
757-
@strongify(self);
758-
return [[self class] _getCurrentUserForQueryState:queryState];
758+
return [selfClass _getCurrentUserForQueryState:queryState];
759759
}] continueWithBlock:^id(BFTask *task) {
760-
@strongify(self);
761760
PFUser *user = task.result;
762-
return [[[self class] queryController] findObjectsAsyncForQueryState:queryState
763-
withCancellationToken:cancellationTokenSource.token
764-
user:user];
761+
return [[selfClass queryController] findObjectsAsyncForQueryState:queryState
762+
withCancellationToken:cancellationTokenSource.token
763+
user:user];
765764
}] continueWithBlock:^id(BFTask *task) {
766765
@strongify(self);
767766
if (!self) {
@@ -856,16 +855,20 @@ - (BFTask *)_countObjectsAsyncForQueryState:(PFQueryState *)queryState after:(BF
856855
BFTask *start = (previousTask ?: [BFTask taskWithResult:nil]);
857856

858857
[self _validateQueryState];
858+
Class selfClass = [self class];
859859
@weakify(self);
860860
return [[[start continueWithBlock:^id(BFTask *task) {
861-
return [[self class] _getCurrentUserForQueryState:queryState];
861+
return [selfClass _getCurrentUserForQueryState:queryState];
862862
}] continueWithBlock:^id(BFTask *task) {
863-
@strongify(self);
864863
PFUser *user = task.result;
865-
return [[[self class] queryController] countObjectsAsyncForQueryState:queryState
864+
return [[selfClass queryController] countObjectsAsyncForQueryState:queryState
866865
withCancellationToken:cancellationTokenSource.token
867866
user:user];
868867
}] continueWithBlock:^id(BFTask *task) {
868+
@strongify(self);
869+
if (!self) {
870+
return task;
871+
}
869872
@synchronized(self) {
870873
if (self->_cancellationTokenSource == cancellationTokenSource) {
871874
self->_cancellationTokenSource = nil;

Parse/Parse/Resources/Parse-OSX.Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.17.0</string>
16+
<string>1.17.1</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>
20-
<string>1.17.0</string>
20+
<string>1.17.1</string>
2121
</dict>
2222
</plist>

Parse/Parse/Resources/Parse-iOS.Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.17.0</string>
16+
<string>1.17.1</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
2222
<string>iPhoneOS</string>
2323
</array>
2424
<key>CFBundleVersion</key>
25-
<string>1.17.0</string>
25+
<string>1.17.1</string>
2626
<key>MinimumOSVersion</key>
2727
<string>6.0</string>
2828
</dict>

Parse/Parse/Resources/Parse-tvOS.Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.17.0</string>
18+
<string>1.17.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.17.0</string>
22+
<string>1.17.1</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

Parse/Parse/Resources/Parse-watchOS.Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.17.0</string>
18+
<string>1.17.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.17.0</string>
22+
<string>1.17.1</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

Parse/Tests/Unit/RelationStateTests.m

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ - (void)testCopying {
8383

8484
- (void)testMutableCopy {
8585
PFMutableRelationState *sampleState = [[self sampleRelationStateWithParent:nil] mutableCopy];
86-
sampleState.knownObjects = [NSMutableSet setWithObjects:@1, nil];
86+
[sampleState.knownObjects removeAllObjects];
87+
[sampleState.knownObjects addObject:@"1"];
8788

8889
XCTAssertEqualObjects([sampleState mutableCopy], sampleState);
8990
}

ParseFacebookUtils/Resources/Info-iOS.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.17.0</string>
16+
<string>1.17.1</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
2222
<string>iPhoneOS</string>
2323
</array>
2424
<key>CFBundleVersion</key>
25-
<string>1.17.0</string>
25+
<string>1.17.1</string>
2626
<key>MinimumOSVersion</key>
2727
<string>6.0</string>
2828
</dict>

ParseFacebookUtils/Resources/Info-tvOS.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.17.0</string>
16+
<string>1.17.1</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>
20-
<string>1.17.0</string>
20+
<string>1.17.1</string>
2121
</dict>
2222
</plist>

ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.17.0</string>
20+
<string>1.17.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>1.17.0</string>
24+
<string>1.17.1</string>
2525
<key>LSMinimumSystemVersion</key>
2626
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2727
<key>NSMainNibFile</key>

ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.17.0</string>
20+
<string>1.17.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>1.17.0</string>
24+
<string>1.17.1</string>
2525
<key>LSMinimumSystemVersion</key>
2626
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
2727
<key>NSMainNibFile</key>

ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.17.0</string>
18+
<string>1.17.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.17.0</string>
22+
<string>1.17.1</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UILaunchStoryboardName</key>

ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.17.0</string>
22+
<string>1.17.1</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleVersion</key>
26-
<string>1.17.0</string>
26+
<string>1.17.1</string>
2727
<key>LSRequiresIPhoneOS</key>
2828
<true/>
2929
<key>NSMainNibFile</key>

0 commit comments

Comments
 (0)