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

Commit

Permalink
Xcode 11, iOS 13, Swift 5 compatibility (#210)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
noobs2ninjas authored and drdaz committed Nov 30, 2019
1 parent 9fa0fb7 commit f4f5a8b
Show file tree
Hide file tree
Showing 27 changed files with 291 additions and 1,070 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
defaults: &defaults
macos:
xcode: "9.0"
xcode: "11.2.1"
shell: /bin/bash --login -eo pipefail
aliases:
- &prepare
|
|
git submodule update --init --recursive
gem install bundler
sudo gem install bundler
bundle install
- &filter-only-master
branches:
Expand Down
15 changes: 9 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
path = Carthage/Checkouts/Parse-SDK-iOS-OSX
url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git
[submodule "Carthage/Checkouts/Starscream"]
path = Carthage/Checkouts/Starscream
url = https://github.com/daltoniam/Starscream.git
[submodule "Carthage/Checkouts/Bolts-Swift"]
path = Carthage/Checkouts/Bolts-Swift
url = https://github.com/BoltsFramework/Bolts-Swift.git
[submodule "Carthage/Checkouts/facebook-objc-sdk"]
path = Carthage/Checkouts/facebook-objc-sdk
url = https://github.com/facebook/facebook-objc-sdk.git
[submodule "Carthage/Checkouts/Starscream"]
path = Carthage/Checkouts/Starscream
url = https://github.com/daltoniam/Starscream.git
[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
path = Carthage/Checkouts/Parse-SDK-iOS-OSX
url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git
[submodule "Carthage/Checkouts/Bolts-ObjC"]
path = Carthage/Checkouts/Bolts-ObjC
url = https://github.com/BoltsFramework/Bolts-ObjC.git
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.3
ruby-2.6.3
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ branches:
- /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/
language: objective-c
os: osx
osx_image: xcode10.1
osx_image: xcode11
cache:
- cocoapods
install: bundle install
install:
- gem install bundler
- bundle install

jobs:
include:
Expand All @@ -30,4 +32,4 @@ jobs:
github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
local_dir: docs/
on:
all_branches: true
all_branches: true
14 changes: 12 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,25 @@

### Master

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

### 2.7.0

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

- 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)
- 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)
- 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)
- 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)
- Properly encode Array of GeoPoints ([#208](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/208)), thanks to [Diamond Lewis](https://github.com/dplewis)

### 2.6.1

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f"
github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.16.0
github "BoltsFramework/Bolts-Swift" == 1.5.0
github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.3
github "daltoniam/Starscream" == 3.0.5
5 changes: 3 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
github "BoltsFramework/Bolts-ObjC" "1.9.0"
github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f"
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0"
github "BoltsFramework/Bolts-Swift" "1.5.0"
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.3"
github "daltoniam/Starscream" "3.0.5"
github "facebook/facebook-objc-sdk" "v5.11.1"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Parse-SDK-iOS-OSX
1 change: 1 addition & 0 deletions Carthage/Checkouts/facebook-objc-sdk
Submodule facebook-objc-sdk added at cf9e0d
11 changes: 6 additions & 5 deletions Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
F519CBA91CA9CA04005295C0 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1030;
LastUpgradeCheck = 1100;
ORGANIZATIONNAME = parse;
TargetAttributes = {
F509D5311CA9E597007B15B0 = {
Expand All @@ -163,10 +163,9 @@
};
buildConfigurationList = F519CBAC1CA9CA04005295C0 /* Build configuration list for PBXProject "LiveQueryDemo-ObjC" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -240,6 +239,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
Expand All @@ -253,6 +253,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo-ObjC/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
Expand Down Expand Up @@ -310,7 +311,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -359,7 +360,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.12;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1030"
LastUpgradeVersion = "1120"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -38,8 +36,8 @@
ReferencedContainer = "container:LiveQueryDemo-ObjC.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -61,8 +59,6 @@
ReferencedContainer = "container:LiveQueryDemo-ObjC.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
19 changes: 11 additions & 8 deletions Examples/LiveQueryDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,20 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 1030;
LastUpgradeCheck = 1100;
ORGANIZATIONNAME = Parse;
TargetAttributes = {
F509D5161CA9E4AE007B15B0 = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 1010;
LastSwiftMigration = 1120;
};
};
};
buildConfigurationList = F59F85A71C9BB48200566A29 /* Build configuration list for PBXProject "LiveQueryDemo" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -221,12 +220,14 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -235,12 +236,14 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NONNULL = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = "$(SRCROOT)/LiveQueryDemo/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down Expand Up @@ -291,7 +294,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -340,7 +343,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1030"
LastUpgradeVersion = "1120"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -38,8 +36,8 @@
ReferencedContainer = "container:LiveQueryDemo.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -61,8 +59,6 @@
ReferencedContainer = "container:LiveQueryDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
source 'https://rubygems.org'

gem 'cocoapods', '~> 1.7.5'
gem 'jazzy', '~> 0.11.1'
gem 'xcpretty'
# xcode8 compat
gem 'cocoapods', '1.5.3'
gem 'jazzy'
Loading

0 comments on commit f4f5a8b

Please sign in to comment.