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

+3-3
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

+9-6
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.3
1+
ruby-2.6.3

.travis.yml

+5-3
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

+12-2
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

+2-2
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

+3-2
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

Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
F519CBA91CA9CA04005295C0 /* Project object */ = {
154154
isa = PBXProject;
155155
attributes = {
156-
LastUpgradeCheck = 1030;
156+
LastUpgradeCheck = 1100;
157157
ORGANIZATIONNAME = parse;
158158
TargetAttributes = {
159159
F509D5311CA9E597007B15B0 = {
@@ -163,10 +163,9 @@
163163
};
164164
buildConfigurationList = F519CBAC1CA9CA04005295C0 /* Build configuration list for PBXProject "LiveQueryDemo-ObjC" */;
165165
compatibilityVersion = "Xcode 3.2";
166-
developmentRegion = English;
166+
developmentRegion = en;
167167
hasScannedForEncodings = 0;
168168
knownRegions = (
169-
English,
170169
en,
171170
Base,
172171
);
@@ -240,6 +239,7 @@
240239
isa = XCBuildConfiguration;
241240
buildSettings = {
242241
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
242+
CODE_SIGN_IDENTITY = "-";
243243
COMBINE_HIDPI_IMAGES = YES;
244244
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
245245
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -253,6 +253,7 @@
253253
isa = XCBuildConfiguration;
254254
buildSettings = {
255255
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
256+
CODE_SIGN_IDENTITY = "-";
256257
COMBINE_HIDPI_IMAGES = YES;
257258
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
258259
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
@@ -310,7 +311,7 @@
310311
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
311312
GCC_WARN_UNUSED_FUNCTION = YES;
312313
GCC_WARN_UNUSED_VARIABLE = YES;
313-
MACOSX_DEPLOYMENT_TARGET = 10.11;
314+
MACOSX_DEPLOYMENT_TARGET = 10.12;
314315
MTL_ENABLE_DEBUG_INFO = YES;
315316
ONLY_ACTIVE_ARCH = YES;
316317
SDKROOT = macosx;
@@ -359,7 +360,7 @@
359360
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
360361
GCC_WARN_UNUSED_FUNCTION = YES;
361362
GCC_WARN_UNUSED_VARIABLE = YES;
362-
MACOSX_DEPLOYMENT_TARGET = 10.11;
363+
MACOSX_DEPLOYMENT_TARGET = 10.12;
363364
MTL_ENABLE_DEBUG_INFO = NO;
364365
SDKROOT = macosx;
365366
};

Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1120"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:LiveQueryDemo-ObjC.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:LiveQueryDemo-ObjC.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

Examples/LiveQueryDemo.xcodeproj/project.pbxproj

+11-8
Original file line numberDiff line numberDiff line change
@@ -141,21 +141,20 @@
141141
isa = PBXProject;
142142
attributes = {
143143
LastSwiftUpdateCheck = 0720;
144-
LastUpgradeCheck = 1030;
144+
LastUpgradeCheck = 1100;
145145
ORGANIZATIONNAME = Parse;
146146
TargetAttributes = {
147147
F509D5161CA9E4AE007B15B0 = {
148148
CreatedOnToolsVersion = 7.3;
149-
LastSwiftMigration = 1010;
149+
LastSwiftMigration = 1120;
150150
};
151151
};
152152
};
153153
buildConfigurationList = F59F85A71C9BB48200566A29 /* Build configuration list for PBXProject "LiveQueryDemo" */;
154154
compatibilityVersion = "Xcode 3.2";
155-
developmentRegion = English;
155+
developmentRegion = en;
156156
hasScannedForEncodings = 0;
157157
knownRegions = (
158-
English,
159158
en,
160159
Base,
161160
);
@@ -221,12 +220,14 @@
221220
buildSettings = {
222221
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
223222
CLANG_ANALYZER_NONNULL = YES;
223+
CODE_SIGN_IDENTITY = "-";
224224
COMBINE_HIDPI_IMAGES = YES;
225225
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo/Info.plist";
226226
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
227+
MACOSX_DEPLOYMENT_TARGET = 10.12;
227228
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
228229
PRODUCT_NAME = "$(TARGET_NAME)";
229-
SWIFT_VERSION = 4.2;
230+
SWIFT_VERSION = 5.0;
230231
};
231232
name = Debug;
232233
};
@@ -235,12 +236,14 @@
235236
buildSettings = {
236237
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
237238
CLANG_ANALYZER_NONNULL = YES;
239+
CODE_SIGN_IDENTITY = "-";
238240
COMBINE_HIDPI_IMAGES = YES;
239241
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo/Info.plist";
240242
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
243+
MACOSX_DEPLOYMENT_TARGET = 10.12;
241244
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
242245
PRODUCT_NAME = "$(TARGET_NAME)";
243-
SWIFT_VERSION = 4.2;
246+
SWIFT_VERSION = 5.0;
244247
};
245248
name = Release;
246249
};
@@ -291,7 +294,7 @@
291294
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
292295
GCC_WARN_UNUSED_FUNCTION = YES;
293296
GCC_WARN_UNUSED_VARIABLE = YES;
294-
MACOSX_DEPLOYMENT_TARGET = 10.11;
297+
MACOSX_DEPLOYMENT_TARGET = 10.10;
295298
MTL_ENABLE_DEBUG_INFO = YES;
296299
ONLY_ACTIVE_ARCH = YES;
297300
SDKROOT = macosx;
@@ -340,7 +343,7 @@
340343
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
341344
GCC_WARN_UNUSED_FUNCTION = YES;
342345
GCC_WARN_UNUSED_VARIABLE = YES;
343-
MACOSX_DEPLOYMENT_TARGET = 10.11;
346+
MACOSX_DEPLOYMENT_TARGET = 10.10;
344347
MTL_ENABLE_DEBUG_INFO = NO;
345348
SDKROOT = macosx;
346349
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Examples/LiveQueryDemo.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo.xcscheme

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1120"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:LiveQueryDemo.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:LiveQueryDemo.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
source 'https://rubygems.org'
22

3+
gem 'cocoapods', '~> 1.7.5'
4+
gem 'jazzy', '~> 0.11.1'
35
gem 'xcpretty'
4-
# xcode8 compat
5-
gem 'cocoapods', '1.5.3'
6-
gem 'jazzy'

0 commit comments

Comments
 (0)