Skip to content

Commit 47df435

Browse files
committed
Merge remote-tracking branch 'ParsePlatform/master' into release/1.15.0
* ParsePlatform/master: ⚡️ Release 1.15.0 (parse-community#1153) ⚡ Release 1.14.5 (parse-community#1152) Add withinPolygon to Query (parse-community#1150) Use getter instead accessing instance variable (parse-community#1026) Makes PFEncoder and PFDecoder public for LiveQuery (parse-community#1149) Let the iOS SDK handle Delete ops when sent from the server (parse-community#928) Outputing offending bundle in assert message. (parse-community#1000) Update documentation links (parse-community#1102) Swift 3 (parse-community#1145) Allowing to re-save installation if LDS is enabled (parse-community#1125) Removed or replaced the broken links in the README (parse-community#1141) update pod spec homepage (parse-community#1135) Update podspec link Update links
2 parents 66002bd + ba0afd1 commit 47df435

File tree

66 files changed

+501
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+501
-210
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ branches:
33
- master
44
language: objective-c
55
os: osx
6-
osx_image: xcode7.3
6+
osx_image: xcode8.3
77
env:
88
global:
99
- LC_CTYPE=en_US.UTF-8
@@ -35,4 +35,4 @@ after_success:
3535
- |
3636
if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = macOS ]; then
3737
bash <(curl -s https://codecov.io/bash)
38-
fi
38+
fi

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "BoltsFramework/Bolts-ObjC" "1.8.4"
2-
github "erikdoe/OCMock" "v3.3.1"
2+
github "erikdoe/OCMock" "v3.4"

Configurations/ParseUnitTests-iOS.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ PRODUCT_NAME = ParseUnitTests-iOS
1414
PRODUCT_MODULE_NAME = ParseUnitTests
1515
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.ios
1616

17+
SWIFT_VERSION = 3.0
18+
1719
IPHONEOS_DEPLOYMENT_TARGET = 8.0
1820

1921
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist

Configurations/ParseUnitTests-macOS.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ PRODUCT_NAME = ParseUnitTests-macOS
1414
PRODUCT_MODULE_NAME = ParseUnitTests
1515
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.macOS
1616

17+
SWIFT_VERSION = 3.0
18+
1719
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-OSX-Info.plist
1820

1921
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**

Parse.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = 'Parse'
3-
s.version = '1.14.4'
3+
s.version = '1.15.0'
44
s.license = { :type => 'BSD', :file => 'LICENSE' }
5-
s.homepage = 'https://www.parse.com/'
5+
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.'
77
s.authors = 'Parse'
88

9-
s.source = { :git => "https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git", :tag => s.version.to_s }
9+
s.source = { :git => "https://github.com/parse-community/Parse-SDK-iOS-OSX.git", :tag => s.version.to_s }
1010

1111
s.platform = :ios, :osx, :tvos, :watchos
1212
s.ios.deployment_target = '7.0'

Parse.xcodeproj/project.pbxproj

Lines changed: 116 additions & 65 deletions
Large diffs are not rendered by default.

Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS-Dynamic.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Parse.xcodeproj/xcshareddata/xcschemes/Parse-macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Parse.xcodeproj/xcshareddata/xcschemes/Parse-tvOS-Dynamic.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)