Skip to content
This repository was archived by the owner on Jun 13, 2023. It is now read-only.

Commit f4f5a8b

Browse files
noobs2ninjasdrdaz
authored andcommitted
Xcode 11, iOS 13, Swift 5 compatibility (#210)
* Removing carthage files. Updating parse version that builds. * Trying to fix building issue. * adding gitmodules * cleaning up carthage files * adding back * Updating build files * Updating xcode version * Changing stage * Updating gemfile * switching back to distribution * Removing xcpretty because of its jazzy incompatibility and updating ruby version. * updating xcode version * removing xcpretty from circle config * Updating bundler version * Reverting back ruby version * Update ruby version because of circleci requirement. * Adding back xcpretty * Trying to fix distributation * Adding install bundler to update version. * Updating travis.yml to fix doc build * putting xcpretty back * Putting some things back * adding bundler install * Stupid jazzy version is broken. * fixing stupid xcode version * Updating jazzy version and gemfile lock. * Updating carthage modules to try and fix builds * Swift 5 updates. Carthage dependencies updated. Podfile updated. * Removing all submodule carthdage data * Lets try this again. * Updating deployment target. * Fixes macOS test * Updates ruby version?? * Reverts .ruby-version * Updates Xcode version * Uses sudo when installing bundler * Specifies Bolts-Swift dependencies * Prunes unused, old libraries / frameworks * Updates podspec * Updates to Swift 5, Bolts-Swift 1.5.0 Updates project to Xcode 11 recommended settings * ... podspec swift version * Sets version to 2.7.0 * Updates Changelog * Update CHANGELOG.md * Update CHANGELOG.md
1 parent 9fa0fb7 commit f4f5a8b

File tree

27 files changed

+291
-1070
lines changed

27 files changed

+291
-1070
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
defaults: &defaults
22
macos:
3-
xcode: "9.0"
3+
xcode: "11.2.1"
44
shell: /bin/bash --login -eo pipefail
55
aliases:
66
- &prepare
7-
|
7+
|
88
git submodule update --init --recursive
9-
gem install bundler
9+
sudo gem install bundler
1010
bundle install
1111
- &filter-only-master
1212
branches:

.gitmodules

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
2-
path = Carthage/Checkouts/Parse-SDK-iOS-OSX
3-
url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git
4-
[submodule "Carthage/Checkouts/Starscream"]
5-
path = Carthage/Checkouts/Starscream
6-
url = https://github.com/daltoniam/Starscream.git
71
[submodule "Carthage/Checkouts/Bolts-Swift"]
82
path = Carthage/Checkouts/Bolts-Swift
93
url = https://github.com/BoltsFramework/Bolts-Swift.git
4+
[submodule "Carthage/Checkouts/facebook-objc-sdk"]
5+
path = Carthage/Checkouts/facebook-objc-sdk
6+
url = https://github.com/facebook/facebook-objc-sdk.git
7+
[submodule "Carthage/Checkouts/Starscream"]
8+
path = Carthage/Checkouts/Starscream
9+
url = https://github.com/daltoniam/Starscream.git
10+
[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
11+
path = Carthage/Checkouts/Parse-SDK-iOS-OSX
12+
url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git
1013
[submodule "Carthage/Checkouts/Bolts-ObjC"]
1114
path = Carthage/Checkouts/Bolts-ObjC
1215
url = https://github.com/BoltsFramework/Bolts-ObjC.git

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.3
1+
ruby-2.6.3

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ branches:
44
- /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/
55
language: objective-c
66
os: osx
7-
osx_image: xcode10.1
7+
osx_image: xcode11
88
cache:
99
- cocoapods
10-
install: bundle install
10+
install:
11+
- gem install bundler
12+
- bundle install
1113

1214
jobs:
1315
include:
@@ -30,4 +32,4 @@ jobs:
3032
github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
3133
local_dir: docs/
3234
on:
33-
all_branches: true
35+
all_branches: true

CHANGELOG.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,25 @@
22

33
### Master
44

5-
[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.6.1...master)
5+
[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.0...master)
6+
7+
### 2.7.0
8+
9+
[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.6.1...2.7.0)
10+
11+
- Build compatibility with Xcode 11 and iOS 13 ([#210](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/210)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas) & [Darren Black](https://github.com/drdaz)
12+
- Bump Parse SDK to v1.17.3 ([#210](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/210)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas) & [Darren Black](https://github.com/drdaz)
13+
- Moves to Swift 5 ([#210](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/210)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas) & [Darren Black](https://github.com/drdaz)
14+
- Bump Bolts-Swift dependency to v1.5.0 ([#210](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/210)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas) & [Darren Black](https://github.com/drdaz)
15+
- Properly encode Array of GeoPoints ([#208](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/208)), thanks to [Diamond Lewis](https://github.com/dplewis)
616

717
### 2.6.1
818

919
[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.6.0...2.6.1)
1020

1121
**This will be the final release for Swift 4.2**
1222

13-
- Fix #190 thanks to [rostopira](https://github.com/rostopira)
23+
- Fix #190, thanks to [rostopira](https://github.com/rostopira)
1424
- Bumps Parse SDK to 1.17.1
1525
- Bumps Starscream to 3.0.5
1626

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f"
2-
github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.16.0
1+
github "BoltsFramework/Bolts-Swift" == 1.5.0
2+
github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.3
33
github "daltoniam/Starscream" == 3.0.5

Cartfile.resolved

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
github "BoltsFramework/Bolts-ObjC" "1.9.0"
2-
github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f"
3-
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0"
2+
github "BoltsFramework/Bolts-Swift" "1.5.0"
3+
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.3"
44
github "daltoniam/Starscream" "3.0.5"
5+
github "facebook/facebook-objc-sdk" "v5.11.1"

Carthage/Checkouts/facebook-objc-sdk

Submodule facebook-objc-sdk added at cf9e0d8

0 commit comments

Comments
 (0)