From 95c275ca35c7ceba0a180537cddb062f1ea11dc3 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sat, 10 Aug 2019 01:31:14 -0500 Subject: [PATCH 01/45] Removing carthage files. Updating parse version that builds. --- .gitmodules | 15 --------------- Cartfile | 2 +- Cartfile.resolved | 5 ----- Carthage/Checkouts/Bolts-ObjC | 1 - Carthage/Checkouts/Bolts-Swift | 1 - Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 - Carthage/Checkouts/Starscream | 1 - Carthage/Checkouts/facebook-ios-sdk | 1 - 8 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 Cartfile.resolved delete mode 160000 Carthage/Checkouts/Bolts-ObjC delete mode 160000 Carthage/Checkouts/Bolts-Swift delete mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX delete mode 160000 Carthage/Checkouts/Starscream delete mode 160000 Carthage/Checkouts/facebook-ios-sdk diff --git a/.gitmodules b/.gitmodules index 273a4ff4..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +0,0 @@ -[submodule "Carthage/Checkouts/Starscream"] - path = Carthage/Checkouts/Starscream - url = https://github.com/daltoniam/Starscream.git -[submodule "Carthage/Checkouts/Bolts-ObjC"] - path = Carthage/Checkouts/Bolts-ObjC - url = https://github.com/BoltsFramework/Bolts-ObjC.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/facebook-ios-sdk"] - path = Carthage/Checkouts/facebook-ios-sdk - url = https://github.com/facebook/facebook-ios-sdk.git -[submodule "Carthage/Checkouts/Bolts-Swift"] - path = Carthage/Checkouts/Bolts-Swift - url = https://github.com/BoltsFramework/Bolts-Swift.git diff --git a/Cartfile b/Cartfile index a6634a09..9c4de734 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" -github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 +github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.16.0 github "daltoniam/Starscream" == 3.0.5 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 8d173606..00000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,5 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" -github "daltoniam/Starscream" "3.0.5" -github "facebook/facebook-ios-sdk" "v4.44.1" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 4dc65427..00000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift deleted file mode 160000 index e7811181..00000000 --- a/Carthage/Checkouts/Bolts-Swift +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX deleted file mode 160000 index b10ccc42..00000000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream deleted file mode 160000 index 114e5df9..00000000 --- a/Carthage/Checkouts/Starscream +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk deleted file mode 160000 index aa2b9ec2..00000000 --- a/Carthage/Checkouts/facebook-ios-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 From e83434c2cf80176456ec2b2536856bc2a106b8a8 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sat, 10 Aug 2019 10:02:19 -0500 Subject: [PATCH 02/45] Trying to fix building issue. --- .gitmodules | 0 Cartfile.resolved | 4 ++++ Carthage/Checkouts/Bolts-ObjC | 1 + Carthage/Checkouts/Bolts-Swift | 1 + Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 + Carthage/Checkouts/Starscream | 1 + .../project.xcworkspace/contents.xcworkspacedata | 7 +++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 8 files changed, 23 insertions(+) delete mode 100644 .gitmodules create mode 100644 Cartfile.resolved create mode 160000 Carthage/Checkouts/Bolts-ObjC create mode 160000 Carthage/Checkouts/Bolts-Swift create mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX create mode 160000 Carthage/Checkouts/Starscream create mode 100644 Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29b..00000000 diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 00000000..cf71988a --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,4 @@ +github "BoltsFramework/Bolts-ObjC" "1.9.0" +github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0" +github "daltoniam/Starscream" "3.0.5" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC new file mode 160000 index 00000000..4dc65427 --- /dev/null +++ b/Carthage/Checkouts/Bolts-ObjC @@ -0,0 +1 @@ +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift new file mode 160000 index 00000000..e7811181 --- /dev/null +++ b/Carthage/Checkouts/Bolts-Swift @@ -0,0 +1 @@ +Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX new file mode 160000 index 00000000..854dd759 --- /dev/null +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -0,0 +1 @@ +Subproject commit 854dd75998636ac54edc16f8e4f1f3918788c598 diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream new file mode 160000 index 00000000..114e5df9 --- /dev/null +++ b/Carthage/Checkouts/Starscream @@ -0,0 +1 @@ +Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 diff --git a/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Examples/LiveQueryDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From 7cff0ddcd11207425dce46377b132da173b9538f Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sat, 10 Aug 2019 10:08:26 -0500 Subject: [PATCH 03/45] adding gitmodules --- .gitmodules | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..34034557 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,8 @@ +[submodule "Carthage/Checkouts/Bolts-ObjC"] + url = https://github.com/BoltsFramework/Bolts-ObjC.git +[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"] + url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git +[submodule "Carthage/Checkouts/Bolts-Swift"] + url = https://github.com/BoltsFramework/Bolts-Swift.git +[submodule "Carthage/Checkouts/Starscream"] + url = https://github.com/daltoniam/Starscream.git From 2ef2b785f6d0a5e41db4240997cda9460516d260 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sat, 10 Aug 2019 10:10:51 -0500 Subject: [PATCH 04/45] cleaning up carthage files --- .gitmodules | 8 -------- Cartfile.resolved | 4 ---- Carthage/Checkouts/Bolts-ObjC | 1 - Carthage/Checkouts/Bolts-Swift | 1 - Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 - Carthage/Checkouts/Starscream | 1 - 6 files changed, 16 deletions(-) delete mode 100644 Cartfile.resolved delete mode 160000 Carthage/Checkouts/Bolts-ObjC delete mode 160000 Carthage/Checkouts/Bolts-Swift delete mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX delete mode 160000 Carthage/Checkouts/Starscream diff --git a/.gitmodules b/.gitmodules index 34034557..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +0,0 @@ -[submodule "Carthage/Checkouts/Bolts-ObjC"] - url = https://github.com/BoltsFramework/Bolts-ObjC.git -[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"] - url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git -[submodule "Carthage/Checkouts/Bolts-Swift"] - url = https://github.com/BoltsFramework/Bolts-Swift.git -[submodule "Carthage/Checkouts/Starscream"] - url = https://github.com/daltoniam/Starscream.git diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index cf71988a..00000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,4 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0" -github "daltoniam/Starscream" "3.0.5" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 4dc65427..00000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift deleted file mode 160000 index e7811181..00000000 --- a/Carthage/Checkouts/Bolts-Swift +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX deleted file mode 160000 index 854dd759..00000000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 854dd75998636ac54edc16f8e4f1f3918788c598 diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream deleted file mode 160000 index 114e5df9..00000000 --- a/Carthage/Checkouts/Starscream +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 From 6994520b6745e541fd283f1ac209c0e836f115cc Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sat, 10 Aug 2019 10:11:42 -0500 Subject: [PATCH 05/45] adding back --- .gitmodules | 12 ++++++++++++ Cartfile.resolved | 4 ++++ Carthage/Checkouts/Bolts-ObjC | 1 + Carthage/Checkouts/Bolts-Swift | 1 + Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 + Carthage/Checkouts/Starscream | 1 + 6 files changed, 20 insertions(+) create mode 100644 Cartfile.resolved create mode 160000 Carthage/Checkouts/Bolts-ObjC create mode 160000 Carthage/Checkouts/Bolts-Swift create mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX create mode 160000 Carthage/Checkouts/Starscream diff --git a/.gitmodules b/.gitmodules index e69de29b..989f2c0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,12 @@ +[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/Bolts-ObjC"] + path = Carthage/Checkouts/Bolts-ObjC + url = https://github.com/BoltsFramework/Bolts-ObjC.git diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 00000000..cf71988a --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,4 @@ +github "BoltsFramework/Bolts-ObjC" "1.9.0" +github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0" +github "daltoniam/Starscream" "3.0.5" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC new file mode 160000 index 00000000..4dc65427 --- /dev/null +++ b/Carthage/Checkouts/Bolts-ObjC @@ -0,0 +1 @@ +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift new file mode 160000 index 00000000..e7811181 --- /dev/null +++ b/Carthage/Checkouts/Bolts-Swift @@ -0,0 +1 @@ +Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX new file mode 160000 index 00000000..854dd759 --- /dev/null +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -0,0 +1 @@ +Subproject commit 854dd75998636ac54edc16f8e4f1f3918788c598 diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream new file mode 160000 index 00000000..114e5df9 --- /dev/null +++ b/Carthage/Checkouts/Starscream @@ -0,0 +1 @@ +Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 From a64317ef12f546a7b2fb9a2035f7470c37276117 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sat, 14 Sep 2019 18:50:07 -0500 Subject: [PATCH 06/45] Updating build files --- .ruby-version | 2 +- .travis.yml | 16 +++++++++------- Gemfile | 3 +-- publish.sh | 1 - 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.ruby-version b/.ruby-version index 81af5fe5..0465952a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.3 +ruby-2.4 diff --git a/.travis.yml b/.travis.yml index c545c7e8..41e15384 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,21 @@ +language: objective-c +os: osx +osx_image: xcode10.2 branches: only: - master - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ -language: objective-c -os: osx -osx_image: xcode10.1 -cache: - - cocoapods -install: bundle install +git: + submodules: false + +before_install: + - git submodule update --init --recursive jobs: include: - stage: distribution env: CocoaPods - script: EXPANDED_CODE_SIGN_IDENTITY="-" EXPANDED_CODE_SIGN_IDENTITY_NAME="-" bundle exec pod lib lint --allow-warnings + script: skip deploy: provider: script skip_cleanup: true diff --git a/Gemfile b/Gemfile index 0819919c..5bf684bf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source 'https://rubygems.org' gem 'xcpretty' -# xcode8 compat -gem 'cocoapods', '1.5.3' +gem 'cocoapods', '~> 1.7.5' gem 'jazzy' diff --git a/publish.sh b/publish.sh index e2f88f72..3eaf6d4e 100755 --- a/publish.sh +++ b/publish.sh @@ -1,5 +1,4 @@ #!/bin/sh -e -rvm use $(< .ruby-version) --install --binary --fuzzy gem install bundler bundle install EXPANDED_CODE_SIGN_IDENTITY="-" EXPANDED_CODE_SIGN_IDENTITY_NAME="-" bundle exec pod trunk push ParseLiveQuery.podspec --allow-warnings From 4ed7a54e9e4569254e6fe1789ecf12af23907c62 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sat, 14 Sep 2019 19:02:57 -0500 Subject: [PATCH 07/45] Updating xcode version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 41e15384..380fcde3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c os: osx -osx_image: xcode10.2 +osx_image: xcode11 branches: only: - master From 0d77db789286031295b51e452bf758ffd796487f Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 00:03:53 -0500 Subject: [PATCH 08/45] Changing stage --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 380fcde3..3a96a1e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: jobs: include: - - stage: distribution + - stage: release env: CocoaPods script: skip deploy: @@ -23,7 +23,7 @@ jobs: on: tags: true all_branches: true - - stage: distribution + - stage: release env: Docs script: bundle exec jazzy deploy: From 5a0edd33c095f98c904f8c3b2835783694d68d95 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 00:13:55 -0500 Subject: [PATCH 09/45] Updating gemfile --- Gemfile.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index be800ef4..09db2490 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,52 +1,52 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) - activesupport (4.2.11) + CFPropertyList (3.0.1) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) - claide (1.0.2) - cocoapods (1.5.3) + claide (1.0.3) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) - cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-core (= 1.7.5) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.3) + ruby-macho (~> 1.4) + xcodeproj (>= 1.10.0, < 2.0) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) + cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.3.1) + cocoapods-trunk (1.4.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) escape (0.0.4) ffi (1.9.18) - fourflusher (2.0.1) + fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -73,7 +73,7 @@ GEM ffi (>= 0.5.0, < 2) redcarpet (3.4.0) rouge (1.11.1) - ruby-macho (1.3.1) + ruby-macho (1.4.0) sass (3.5.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -85,7 +85,7 @@ GEM thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.8.0) + xcodeproj (1.12.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -98,9 +98,9 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.5.3) + cocoapods (~> 1.7.5) jazzy xcpretty BUNDLED WITH - 1.17.3 + 2.0.2 From 2ac94d9c73103922827600f4d78264c5308df9e9 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 00:24:15 -0500 Subject: [PATCH 10/45] switching back to distribution --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a96a1e2..b3c69f31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ jobs: on: tags: true all_branches: true - - stage: release + - stage: distribution env: Docs script: bundle exec jazzy deploy: From d6e0761ce2729238e95db34279a25ea989df7396 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 02:27:12 -0500 Subject: [PATCH 11/45] Removing xcpretty because of its jazzy incompatibility and updating ruby version. --- .ruby-version | 2 +- Gemfile | 3 +-- Gemfile.lock | 37 ++++++++++++++----------------------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/.ruby-version b/.ruby-version index 0465952a..0b4a2023 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.4 +ruby-2.4.6 diff --git a/Gemfile b/Gemfile index 5bf684bf..3a811dac 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source 'https://rubygems.org' -gem 'xcpretty' gem 'cocoapods', '~> 1.7.5' -gem 'jazzy' +gem 'jazzy', '~> 0.11.0' diff --git a/Gemfile.lock b/Gemfile.lock index 09db2490..f3212f60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,41 +45,35 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.5) escape (0.0.4) - ffi (1.9.18) + ffi (1.11.1) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.9.0) - cocoapods (~> 1.0) - mustache (~> 0.99) + jazzy (0.11.0) + cocoapods (~> 1.5) + mustache (~> 1.1) open4 - redcarpet (~> 3.2) - rouge (~> 1.5) - sass (~> 3.4) + redcarpet (~> 3.4) + rouge (>= 2.0.6, < 4.0) + sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) liferaft (0.0.6) minitest (5.11.3) molinillo (0.6.6) - mustache (0.99.8) + mustache (1.1.0) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) open4 (1.3.4) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - redcarpet (3.4.0) - rouge (1.11.1) + redcarpet (3.5.0) + rouge (3.10.0) ruby-macho (1.4.0) - sass (3.5.3) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sqlite3 (1.3.13) + sassc (2.2.0) + ffi (~> 1.9) + sqlite3 (1.4.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) @@ -91,16 +85,13 @@ GEM claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.2.6) - xcpretty (0.2.2) - rouge (~> 1.8) PLATFORMS ruby DEPENDENCIES cocoapods (~> 1.7.5) - jazzy - xcpretty + jazzy (~> 0.11.0) BUNDLED WITH 2.0.2 From 52ee1513f175abfff5f70179974accb49395b51a Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 02:27:56 -0500 Subject: [PATCH 12/45] updating xcode version --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 500dd96b..92106afa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,10 +1,10 @@ defaults: &defaults macos: - xcode: "9.0" + xcode: "11.0" shell: /bin/bash --login -eo pipefail aliases: - &prepare - | + | git submodule update --init --recursive gem install bundler bundle install From ef9f48aac917dcd0f739f1e4ebc5cdea1a050fb1 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 02:46:06 -0500 Subject: [PATCH 13/45] removing xcpretty from circle config --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92106afa..a2446549 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: steps: - checkout - run: *prepare - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk iphonesimulator -scheme ParseLiveQuery-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk iphonesimulator -scheme ParseLiveQuery-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES; - run: bash <(curl -s https://codecov.io/bash) - store_test_results: path: build/reports @@ -29,7 +29,7 @@ jobs: steps: - checkout - run: *prepare - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk macosx -scheme ParseLiveQuery-OSX -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk macosx -scheme ParseLiveQuery-OSX -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES; - run: bash <(curl -s https://codecov.io/bash) - store_test_results: path: build/reports @@ -39,11 +39,11 @@ jobs: - checkout - run: *prepare - run: | - xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo | xcpretty -c; - xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo -configuration Debug | xcpretty -c; + xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo; + xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo -configuration Debug; - run: | - xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC | xcpretty -c; - xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c; + xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC; + xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug; carthage: <<: *defaults steps: From 6bfd6e842eb5ff13fdf4c4bc7c57573b6e8dd7be Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 02:58:57 -0500 Subject: [PATCH 14/45] Updating bundler version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f3212f60..c288fc1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,4 +94,4 @@ DEPENDENCIES jazzy (~> 0.11.0) BUNDLED WITH - 2.0.2 + 1.17.3 From fcbdf3f55369831da23915628c24af1752d3cf29 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 03:14:43 -0500 Subject: [PATCH 15/45] Reverting back ruby version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 0b4a2023..0465952a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.4.6 +ruby-2.4 From bb606e33f1ee704641a789b3afed45be229826f6 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 03:30:03 -0500 Subject: [PATCH 16/45] Update ruby version because of circleci requirement. --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 0465952a..4560fb91 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.4 +ruby-2.6.3 From 8daed73fa90f47a53625ca9fc051656cc2a7dba7 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 03:57:14 -0500 Subject: [PATCH 17/45] Adding back xcpretty --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 3a811dac..66384023 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,4 @@ source 'https://rubygems.org' gem 'cocoapods', '~> 1.7.5' gem 'jazzy', '~> 0.11.0' +gem 'xcpretty' diff --git a/Gemfile.lock b/Gemfile.lock index c288fc1e..ba370a73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,6 +85,7 @@ GEM claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.2.6) + xcpretty (0.1.12) PLATFORMS ruby @@ -92,6 +93,7 @@ PLATFORMS DEPENDENCIES cocoapods (~> 1.7.5) jazzy (~> 0.11.0) + xcpretty BUNDLED WITH 1.17.3 From 0e18b8d5b772b2dcbccfb800e0927525d714b6f6 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 04:07:44 -0500 Subject: [PATCH 18/45] Trying to fix distributation --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3c69f31..1f61c132 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,15 @@ branches: - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ git: submodules: false - +cache: + - cocoapods before_install: - git submodule update --init --recursive +install: bundle install jobs: include: - - stage: release + - stage: distribution env: CocoaPods script: skip deploy: From ab97f2270e850778e65593e23d936a3aa6ad14b6 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 04:33:10 -0500 Subject: [PATCH 19/45] Adding install bundler to update version. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f61c132..55b4bd92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,9 @@ branches: - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ git: submodules: false -cache: - - cocoapods + before_install: - git submodule update --init --recursive -install: bundle install - jobs: include: - stage: distribution @@ -27,7 +24,10 @@ jobs: all_branches: true - stage: distribution env: Docs - script: bundle exec jazzy + script: + - gem install bundler + - bundle install + - bundle exec jazzy deploy: provider: pages skip_cleanup: true From 3d8e68d948be86a6bf7c97cd09ceb34350952c49 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 04:44:02 -0500 Subject: [PATCH 20/45] Updating travis.yml to fix doc build --- .travis.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55b4bd92..f6f71029 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,21 @@ -language: objective-c -os: osx -osx_image: xcode11 branches: only: - master - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ -git: - submodules: false - +language: objective-c +os: osx +osx_image: xcode11 +cache: + - cocoapods before_install: - git submodule update --init --recursive +install: bundle install + jobs: include: - stage: distribution env: CocoaPods - script: skip + script: EXPANDED_CODE_SIGN_IDENTITY="-" EXPANDED_CODE_SIGN_IDENTITY_NAME="-" bundle exec pod lib lint --allow-warnings deploy: provider: script skip_cleanup: true @@ -24,10 +25,7 @@ jobs: all_branches: true - stage: distribution env: Docs - script: - - gem install bundler - - bundle install - - bundle exec jazzy + script: bundle exec jazzy deploy: provider: pages skip_cleanup: true From cb21968412fd1e788417ed2e8aa59306273a51fd Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 04:55:56 -0500 Subject: [PATCH 21/45] putting xcpretty back --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2446549..92106afa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: steps: - checkout - run: *prepare - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk iphonesimulator -scheme ParseLiveQuery-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES; + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk iphonesimulator -scheme ParseLiveQuery-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; - run: bash <(curl -s https://codecov.io/bash) - store_test_results: path: build/reports @@ -29,7 +29,7 @@ jobs: steps: - checkout - run: *prepare - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk macosx -scheme ParseLiveQuery-OSX -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES; + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk macosx -scheme ParseLiveQuery-OSX -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; - run: bash <(curl -s https://codecov.io/bash) - store_test_results: path: build/reports @@ -39,11 +39,11 @@ jobs: - checkout - run: *prepare - run: | - xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo; - xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo -configuration Debug; + xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo | xcpretty -c; + xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo -configuration Debug | xcpretty -c; - run: | - xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC; - xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug; + xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC | xcpretty -c; + xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c; carthage: <<: *defaults steps: From e453ed58294b9cb123a13274fe2768cd596a30ef Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 05:18:55 -0500 Subject: [PATCH 22/45] Putting some things back --- .circleci/config.yml | 2 +- .travis.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92106afa..2bb1f9fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults macos: - xcode: "11.0" + xcode: "9.0" shell: /bin/bash --login -eo pipefail aliases: - &prepare diff --git a/.travis.yml b/.travis.yml index f6f71029..de8c9990 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ os: osx osx_image: xcode11 cache: - cocoapods -before_install: - - git submodule update --init --recursive install: bundle install jobs: @@ -32,4 +30,4 @@ jobs: github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard local_dir: docs/ on: - all_branches: true + all_branches: true \ No newline at end of file From bccebf504326ed4d11aca6c4d70f0d4c17c85908 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 05:36:15 -0500 Subject: [PATCH 23/45] adding bundler install --- .travis.yml | 4 +++- Gemfile.lock | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index de8c9990..4728db33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,9 @@ os: osx osx_image: xcode11 cache: - cocoapods -install: bundle install +install: + - gem install bundler + - bundle install jobs: include: diff --git a/Gemfile.lock b/Gemfile.lock index ba370a73..6e4772f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM netrc (0.11.0) open4 (1.3.4) redcarpet (3.5.0) - rouge (3.10.0) + rouge (2.0.7) ruby-macho (1.4.0) sassc (2.2.0) ffi (~> 1.9) @@ -85,7 +85,8 @@ GEM claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.2.6) - xcpretty (0.1.12) + xcpretty (0.3.0) + rouge (~> 2.0.7) PLATFORMS ruby From 9cc4816363c93c7b52d28f09cdcc6826e243ed88 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 07:09:45 -0500 Subject: [PATCH 24/45] Stupid jazzy version is broken. --- Gemfile | 2 +- Gemfile.lock | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 66384023..42b4e209 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' gem 'cocoapods', '~> 1.7.5' -gem 'jazzy', '~> 0.11.0' +gem 'jazzy', '~> 0.10.0' gem 'xcpretty' diff --git a/Gemfile.lock b/Gemfile.lock index 6e4772f2..26adfe3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,13 +51,13 @@ GEM gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.11.0) + jazzy (0.10.0) cocoapods (~> 1.5) mustache (~> 1.1) open4 redcarpet (~> 3.4) rouge (>= 2.0.6, < 4.0) - sassc (~> 2.1) + sass (~> 3.6) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) liferaft (0.0.6) @@ -68,11 +68,17 @@ GEM nap (1.1.0) netrc (0.11.0) open4 (1.3.4) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) redcarpet (3.5.0) rouge (2.0.7) ruby-macho (1.4.0) - sassc (2.2.0) - ffi (~> 1.9) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sqlite3 (1.4.1) thread_safe (0.3.6) tzinfo (1.2.5) @@ -93,7 +99,7 @@ PLATFORMS DEPENDENCIES cocoapods (~> 1.7.5) - jazzy (~> 0.11.0) + jazzy (~> 0.10.0) xcpretty BUNDLED WITH From 7c4b806039421f51f02e9b31aba0e661e9d9808d Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 15 Sep 2019 07:15:41 -0500 Subject: [PATCH 25/45] fixing stupid xcode version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2bb1f9fe..8dec1a5a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults macos: - xcode: "9.0" + xcode: "11.0.0" shell: /bin/bash --login -eo pipefail aliases: - &prepare From 408ce47e304a1daec4f10c8b0d589fd41882d038 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Tue, 17 Sep 2019 11:39:10 -0500 Subject: [PATCH 26/45] Updating jazzy version and gemfile lock. --- Gemfile | 2 +- Gemfile.lock | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 42b4e209..68785475 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' gem 'cocoapods', '~> 1.7.5' -gem 'jazzy', '~> 0.10.0' +gem 'jazzy', '~> 0.11.1' gem 'xcpretty' diff --git a/Gemfile.lock b/Gemfile.lock index 26adfe3b..f2812dea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,13 +51,13 @@ GEM gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.10.0) + jazzy (0.11.1) cocoapods (~> 1.5) mustache (~> 1.1) open4 redcarpet (~> 3.4) rouge (>= 2.0.6, < 4.0) - sass (~> 3.6) + sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) liferaft (0.0.6) @@ -68,17 +68,11 @@ GEM nap (1.1.0) netrc (0.11.0) open4 (1.3.4) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) - ffi (~> 1.0) redcarpet (3.5.0) rouge (2.0.7) ruby-macho (1.4.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.0) + ffi (~> 1.9) sqlite3 (1.4.1) thread_safe (0.3.6) tzinfo (1.2.5) @@ -99,7 +93,7 @@ PLATFORMS DEPENDENCIES cocoapods (~> 1.7.5) - jazzy (~> 0.10.0) + jazzy (~> 0.11.1) xcpretty BUNDLED WITH From 779f60d2b95899bd62f68b020221c7fc12882919 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Tue, 17 Sep 2019 17:57:15 -0500 Subject: [PATCH 27/45] Updating carthage modules to try and fix builds --- .gitmodules | 3 +++ Cartfile | 4 ++-- Cartfile.resolved | 5 +++-- Carthage/Checkouts/Parse-SDK-iOS-OSX | 2 +- Carthage/Checkouts/facebook-ios-sdk | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) create mode 160000 Carthage/Checkouts/facebook-ios-sdk diff --git a/.gitmodules b/.gitmodules index 989f2c0d..add47048 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "Carthage/Checkouts/Bolts-ObjC"] path = Carthage/Checkouts/Bolts-ObjC url = https://github.com/BoltsFramework/Bolts-ObjC.git +[submodule "Carthage/Checkouts/facebook-ios-sdk"] + path = Carthage/Checkouts/facebook-ios-sdk + url = https://github.com/facebook/facebook-ios-sdk.git diff --git a/Cartfile b/Cartfile index 9c4de734..2efce0c6 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "BoltsFramework/Bolts-Swift" "e7811181243e9dfa9462ec3048cd5957519fa26f" -github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.16.0 +github "BoltsFramework/Bolts-Swift" == 1.4.0 +github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 github "daltoniam/Starscream" == 3.0.5 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index cf71988a..e98ea8ad 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -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.4.0" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" github "daltoniam/Starscream" "3.0.5" +github "facebook/facebook-ios-sdk" "v4.44.1" diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index 854dd759..b10ccc42 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit 854dd75998636ac54edc16f8e4f1f3918788c598 +Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk new file mode 160000 index 00000000..aa2b9ec2 --- /dev/null +++ b/Carthage/Checkouts/facebook-ios-sdk @@ -0,0 +1 @@ +Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 From 7c122f9b766e92e37238adb941d2e08fdfd7e27d Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Tue, 17 Sep 2019 18:32:24 -0500 Subject: [PATCH 28/45] Swift 5 updates. Carthage dependencies updated. Podfile updated. --- .gitmodules | 6 +++--- Cartfile | 2 +- Cartfile.resolved | 4 ++-- Carthage/Checkouts/Parse-SDK-iOS-OSX | 2 +- Carthage/Checkouts/facebook-ios-sdk | 1 - Carthage/Checkouts/facebook-objc-sdk | 1 + Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj | 11 ++++++----- .../xcschemes/LiveQueryDemo-ObjC.xcscheme | 10 +++------- Examples/LiveQueryDemo.xcodeproj/project.pbxproj | 11 ++++++----- .../xcshareddata/xcschemes/LiveQueryDemo.xcscheme | 10 +++------- ParseLiveQuery.podspec | 11 ++++++----- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 6 +++--- .../xcschemes/ParseLiveQuery-OSX.xcscheme | 6 +----- .../xcschemes/ParseLiveQuery-iOS.xcscheme | 6 +----- Sources/ParseLiveQuery/Internal/ClientPrivate.swift | 4 ++-- Sources/ParseLiveQuery/Parse+LiveQuery.swift | 2 +- 16 files changed, 40 insertions(+), 53 deletions(-) delete mode 160000 Carthage/Checkouts/facebook-ios-sdk create mode 160000 Carthage/Checkouts/facebook-objc-sdk diff --git a/.gitmodules b/.gitmodules index add47048..8150d906 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,6 @@ [submodule "Carthage/Checkouts/Bolts-ObjC"] path = Carthage/Checkouts/Bolts-ObjC url = https://github.com/BoltsFramework/Bolts-ObjC.git -[submodule "Carthage/Checkouts/facebook-ios-sdk"] - path = Carthage/Checkouts/facebook-ios-sdk - url = https://github.com/facebook/facebook-ios-sdk.git +[submodule "Carthage/Checkouts/facebook-objc-sdk"] + path = Carthage/Checkouts/facebook-objc-sdk + url = https://github.com/facebook/facebook-objc-sdk.git diff --git a/Cartfile b/Cartfile index 2efce0c6..6a9b2ff4 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" == 1.4.0 -github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.1 +github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.3 github "daltoniam/Starscream" == 3.0.5 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index e98ea8ad..93c25b02 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "BoltsFramework/Bolts-Swift" "1.4.0" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.1" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.3" github "daltoniam/Starscream" "3.0.5" -github "facebook/facebook-ios-sdk" "v4.44.1" +github "facebook/facebook-objc-sdk" "v5.6.0" diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index b10ccc42..44397810 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit b10ccc42477b4f7283b464d53bf5ca3eb374d3ab +Subproject commit 4439781088ac62e9524fd0167b83490571625fb7 diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk deleted file mode 160000 index aa2b9ec2..00000000 --- a/Carthage/Checkouts/facebook-ios-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa2b9ec292b970eeaa74e331587a74569bff8336 diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk new file mode 160000 index 00000000..cf9e0d83 --- /dev/null +++ b/Carthage/Checkouts/facebook-objc-sdk @@ -0,0 +1 @@ +Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj index 53e8f232..195abb43 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj @@ -153,7 +153,7 @@ F519CBA91CA9CA04005295C0 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1030; + LastUpgradeCheck = 1100; ORGANIZATIONNAME = parse; TargetAttributes = { F509D5311CA9E597007B15B0 = { @@ -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, ); @@ -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"; @@ -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"; @@ -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.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -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.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; }; diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme b/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme index 4ada91ca..0ff09a0b 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - - - - - + + - - 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'http://parseplatform.org' @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.platform = :ios, :osx, :tvos - s.swift_version = '4.2' + s.swift_version = '5.0' s.cocoapods_version = '>= 1.4' s.ios.deployment_target = '8.0' @@ -22,8 +22,9 @@ Pod::Spec.new do |s| s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse', '~> 1.17.1' + s.dependency 'Parse', '~> 1.17.3' s.dependency 'Bolts-Swift', '~> 1.4.0' - s.dependency 'Starscream', '~> 3.0.5' + s.dependency 'Starscream', '~> 3.1.0' s.dependency 'Bolts', '~> 1.9.0' -end + +end \ No newline at end of file diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 7d2ad8d7..5bf47fcc 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -489,7 +489,7 @@ TargetAttributes = { F5903CE91BD999C500C3EFFE = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 1010; + LastSwiftMigration = 1100; }; F5A9BFB61BE0248D00E78326 = { LastSwiftMigration = 1010; @@ -848,7 +848,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -872,7 +872,7 @@ PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme index f4bcc048..1e238ed1 100644 --- a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme +++ b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - SubscriptionRecord? { guard - let recordIndex = self.subscriptions.index(where: { $0.requestId == requestId }) else { + let recordIndex = self.subscriptions.firstIndex(where: { $0.requestId == requestId }) else { return nil } let record = self.subscriptions[recordIndex] @@ -225,7 +225,7 @@ extension Client { case .unsubscribed(let requestId): guard - let recordIndex = self.subscriptions.index(where: { $0.requestId == requestId }) + let recordIndex = self.subscriptions.firstIndex(where: { $0.requestId == requestId }) else { break } diff --git a/Sources/ParseLiveQuery/Parse+LiveQuery.swift b/Sources/ParseLiveQuery/Parse+LiveQuery.swift index ac098fdb..9e7093e3 100644 --- a/Sources/ParseLiveQuery/Parse+LiveQuery.swift +++ b/Sources/ParseLiveQuery/Parse+LiveQuery.swift @@ -11,7 +11,7 @@ import Parse extension Parse { static func validatedCurrentConfiguration() -> ParseClientConfiguration { - guard let configuration = Parse.currentConfiguration() else { + guard let configuration = Parse.currentConfiguration else { preconditionFailure("Parse SDK is not initialized. Call Parse.initializeWithConfiguration() before loading live query client.") } return configuration From e00d75d64d5ab21de1af075959a608c4923d3009 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Tue, 17 Sep 2019 21:48:09 -0500 Subject: [PATCH 29/45] Removing all submodule carthdage data --- .gitmodules | 15 - Cartfile.resolved | 5 - Carthage/Checkouts/Bolts-ObjC | 1 - Carthage/Checkouts/Bolts-Swift | 1 - Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 - Carthage/Checkouts/Starscream | 1 - Carthage/Checkouts/facebook-objc-sdk | 1 - Sources/BoltsSwift.xcodeproj/project.pbxproj | 890 ------------------ .../contents.xcworkspacedata | 7 - .../ParseLiveQuery.xcodeproj/project.pbxproj | 10 +- Sources/ParseLiveQuery/Info.plist | 2 +- 11 files changed, 7 insertions(+), 927 deletions(-) delete mode 100644 .gitmodules delete mode 100644 Cartfile.resolved delete mode 160000 Carthage/Checkouts/Bolts-ObjC delete mode 160000 Carthage/Checkouts/Bolts-Swift delete mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX delete mode 160000 Carthage/Checkouts/Starscream delete mode 160000 Carthage/Checkouts/facebook-objc-sdk delete mode 100644 Sources/BoltsSwift.xcodeproj/project.pbxproj delete mode 100644 Sources/BoltsSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8150d906..00000000 --- a/.gitmodules +++ /dev/null @@ -1,15 +0,0 @@ -[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/Bolts-ObjC"] - path = Carthage/Checkouts/Bolts-ObjC - url = https://github.com/BoltsFramework/Bolts-ObjC.git -[submodule "Carthage/Checkouts/facebook-objc-sdk"] - path = Carthage/Checkouts/facebook-objc-sdk - url = https://github.com/facebook/facebook-objc-sdk.git diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 93c25b02..00000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,5 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "BoltsFramework/Bolts-Swift" "1.4.0" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.3" -github "daltoniam/Starscream" "3.0.5" -github "facebook/facebook-objc-sdk" "v5.6.0" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 4dc65427..00000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift deleted file mode 160000 index e7811181..00000000 --- a/Carthage/Checkouts/Bolts-Swift +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX deleted file mode 160000 index 44397810..00000000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4439781088ac62e9524fd0167b83490571625fb7 diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream deleted file mode 160000 index 114e5df9..00000000 --- a/Carthage/Checkouts/Starscream +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk deleted file mode 160000 index cf9e0d83..00000000 --- a/Carthage/Checkouts/facebook-objc-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 diff --git a/Sources/BoltsSwift.xcodeproj/project.pbxproj b/Sources/BoltsSwift.xcodeproj/project.pbxproj deleted file mode 100644 index 4ea1df83..00000000 --- a/Sources/BoltsSwift.xcodeproj/project.pbxproj +++ /dev/null @@ -1,890 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 065894EF1C9A9391000FDDA6 /* Task.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300651C93AF7300E1A1ED /* Task.swift */; }; - 065894F01C9A9391000FDDA6 /* TaskCompletionSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300661C93AF7300E1A1ED /* TaskCompletionSource.swift */; }; - 065894F11C9A9391000FDDA6 /* Executor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300641C93AF7300E1A1ED /* Executor.swift */; }; - 065894F21C9A9391000FDDA6 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300631C93AF7300E1A1ED /* Errors.swift */; }; - 065894F51C9A93B7000FDDA6 /* Executor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300641C93AF7300E1A1ED /* Executor.swift */; }; - 065894F61C9A93B7000FDDA6 /* Task.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300651C93AF7300E1A1ED /* Task.swift */; }; - 065894F71C9A93B7000FDDA6 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300631C93AF7300E1A1ED /* Errors.swift */; }; - 065894F81C9A93B7000FDDA6 /* TaskCompletionSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300661C93AF7300E1A1ED /* TaskCompletionSource.swift */; }; - 065895121C9A947B000FDDA6 /* ExecutorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300751C93AF9F00E1A1ED /* ExecutorTests.swift */; }; - 065895131C9A947B000FDDA6 /* TaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300781C93AF9F00E1A1ED /* TaskTests.swift */; }; - 065895141C9A947B000FDDA6 /* TaskCompletionSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300771C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift */; }; - 0658951F1C9A9496000FDDA6 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 065894FF1C9A93B7000FDDA6 /* BoltsSwift.framework */; }; - 810AB3201C9B1AC3005B6184 /* XCTestCase+TestName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810AB31F1C9B1AC3005B6184 /* XCTestCase+TestName.swift */; }; - 810AB3211C9B1AC3005B6184 /* XCTestCase+TestName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810AB31F1C9B1AC3005B6184 /* XCTestCase+TestName.swift */; }; - 810AB3221C9B1AC3005B6184 /* XCTestCase+TestName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 810AB31F1C9B1AC3005B6184 /* XCTestCase+TestName.swift */; }; - 81CC14F71A9BE0A100B28F86 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81CC14EC1A9BE0A100B28F86 /* BoltsSwift.framework */; }; - 81D300681C93AF7300E1A1ED /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300631C93AF7300E1A1ED /* Errors.swift */; }; - 81D300691C93AF7300E1A1ED /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300631C93AF7300E1A1ED /* Errors.swift */; }; - 81D3006A1C93AF7300E1A1ED /* Executor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300641C93AF7300E1A1ED /* Executor.swift */; }; - 81D3006B1C93AF7300E1A1ED /* Executor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300641C93AF7300E1A1ED /* Executor.swift */; }; - 81D3006C1C93AF7300E1A1ED /* Task.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300651C93AF7300E1A1ED /* Task.swift */; }; - 81D3006D1C93AF7300E1A1ED /* Task.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300651C93AF7300E1A1ED /* Task.swift */; }; - 81D3006E1C93AF7300E1A1ED /* TaskCompletionSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300661C93AF7300E1A1ED /* TaskCompletionSource.swift */; }; - 81D3006F1C93AF7300E1A1ED /* TaskCompletionSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300661C93AF7300E1A1ED /* TaskCompletionSource.swift */; }; - 81D300791C93AF9F00E1A1ED /* ExecutorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300751C93AF9F00E1A1ED /* ExecutorTests.swift */; }; - 81D3007A1C93AF9F00E1A1ED /* ExecutorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300751C93AF9F00E1A1ED /* ExecutorTests.swift */; }; - 81D3007D1C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300771C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift */; }; - 81D3007E1C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300771C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift */; }; - 81D3007F1C93AF9F00E1A1ED /* TaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300781C93AF9F00E1A1ED /* TaskTests.swift */; }; - 81D300801C93AF9F00E1A1ED /* TaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81D300781C93AF9F00E1A1ED /* TaskTests.swift */; }; - 87FEF3721A9085FA00C60678 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87FEF3661A9085FA00C60678 /* BoltsSwift.framework */; }; - F569C0C11CFF6A07000749B6 /* Task+ContinueWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0C01CFF6A07000749B6 /* Task+ContinueWith.swift */; }; - F569C0C21CFF6A07000749B6 /* Task+ContinueWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0C01CFF6A07000749B6 /* Task+ContinueWith.swift */; }; - F569C0C31CFF6A07000749B6 /* Task+ContinueWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0C01CFF6A07000749B6 /* Task+ContinueWith.swift */; }; - F569C0C41CFF6A07000749B6 /* Task+ContinueWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0C01CFF6A07000749B6 /* Task+ContinueWith.swift */; }; - F569C0CC1CFF6AEE000749B6 /* Task+Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0CB1CFF6AEE000749B6 /* Task+Delay.swift */; }; - F569C0CD1CFF6AEE000749B6 /* Task+Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0CB1CFF6AEE000749B6 /* Task+Delay.swift */; }; - F569C0CE1CFF6AEE000749B6 /* Task+Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0CB1CFF6AEE000749B6 /* Task+Delay.swift */; }; - F569C0CF1CFF6AEE000749B6 /* Task+Delay.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0CB1CFF6AEE000749B6 /* Task+Delay.swift */; }; - F569C0D71CFF6B18000749B6 /* Task+WhenAll.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0D61CFF6B18000749B6 /* Task+WhenAll.swift */; }; - F569C0D81CFF6B18000749B6 /* Task+WhenAll.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0D61CFF6B18000749B6 /* Task+WhenAll.swift */; }; - F569C0D91CFF6B18000749B6 /* Task+WhenAll.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0D61CFF6B18000749B6 /* Task+WhenAll.swift */; }; - F569C0DA1CFF6B18000749B6 /* Task+WhenAll.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0D61CFF6B18000749B6 /* Task+WhenAll.swift */; }; - F569C0E11CFF6B1F000749B6 /* Task+WhenAny.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0E01CFF6B1F000749B6 /* Task+WhenAny.swift */; }; - F569C0E21CFF6B1F000749B6 /* Task+WhenAny.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0E01CFF6B1F000749B6 /* Task+WhenAny.swift */; }; - F569C0E31CFF6B1F000749B6 /* Task+WhenAny.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0E01CFF6B1F000749B6 /* Task+WhenAny.swift */; }; - F569C0E41CFF6B1F000749B6 /* Task+WhenAny.swift in Sources */ = {isa = PBXBuildFile; fileRef = F569C0E01CFF6B1F000749B6 /* Task+WhenAny.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 0658951D1C9A948E000FDDA6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 87FEF35D1A9085FA00C60678 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 065894F31C9A93B7000FDDA6; - remoteInfo = "BoltsSwift-tvOS"; - }; - 81CC14F81A9BE0A100B28F86 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 87FEF35D1A9085FA00C60678 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 81CC14EB1A9BE0A100B28F86; - remoteInfo = "Bolts-Mac"; - }; - 87FEF3731A9085FA00C60678 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 87FEF35D1A9085FA00C60678 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 87FEF3651A9085FA00C60678; - remoteInfo = Bolts; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 065894E71C9A933B000FDDA6 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 065894FF1C9A93B7000FDDA6 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 0658951B1C9A947B000FDDA6 /* BoltsSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BoltsSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 810AB31F1C9B1AC3005B6184 /* XCTestCase+TestName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "XCTestCase+TestName.swift"; sourceTree = ""; }; - 812DB5271D3597BF00552C9F /* BoltsSwift-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "BoltsSwift-iOS.xcconfig"; sourceTree = ""; }; - 812DB5281D3597BF00552C9F /* BoltsSwift-macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "BoltsSwift-macOS.xcconfig"; sourceTree = ""; }; - 812DB5291D3597BF00552C9F /* BoltsSwift-tvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "BoltsSwift-tvOS.xcconfig"; sourceTree = ""; }; - 812DB52A1D3597BF00552C9F /* BoltsSwift-watchOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "BoltsSwift-watchOS.xcconfig"; sourceTree = ""; }; - 812DB52B1D3597BF00552C9F /* BoltsSwiftTests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "BoltsSwiftTests-iOS.xcconfig"; sourceTree = ""; }; - 812DB52C1D3597BF00552C9F /* BoltsSwiftTests-macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "BoltsSwiftTests-macOS.xcconfig"; sourceTree = ""; }; - 812DB52D1D3597BF00552C9F /* BoltsSwiftTests-tvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "BoltsSwiftTests-tvOS.xcconfig"; sourceTree = ""; }; - 812DB52F1D3597BF00552C9F /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = ""; }; - 812DB5311D3597BF00552C9F /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = ""; }; - 812DB5321D3597BF00552C9F /* macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = macOS.xcconfig; sourceTree = ""; }; - 812DB5331D3597BF00552C9F /* tvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = tvOS.xcconfig; sourceTree = ""; }; - 812DB5341D3597BF00552C9F /* watchOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = watchOS.xcconfig; sourceTree = ""; }; - 812DB5361D3597BF00552C9F /* Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Application.xcconfig; sourceTree = ""; }; - 812DB5371D3597BF00552C9F /* DynamicFramework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DynamicFramework.xcconfig; sourceTree = ""; }; - 812DB5381D3597BF00552C9F /* LogicTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = LogicTests.xcconfig; sourceTree = ""; }; - 812DB5391D3597BF00552C9F /* StaticFramework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = StaticFramework.xcconfig; sourceTree = ""; }; - 812DB53B1D3597BF00552C9F /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - 812DB53C1D3597BF00552C9F /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 812DB53D1D3597BF00552C9F /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; - 81951A901D46BA2F00958108 /* Version.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = ""; }; - 81CC14EC1A9BE0A100B28F86 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 81CC14F61A9BE0A100B28F86 /* BoltsSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BoltsSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 81D300631C93AF7300E1A1ED /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = ""; }; - 81D300641C93AF7300E1A1ED /* Executor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Executor.swift; sourceTree = ""; }; - 81D300651C93AF7300E1A1ED /* Task.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Task.swift; sourceTree = ""; }; - 81D300661C93AF7300E1A1ED /* TaskCompletionSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TaskCompletionSource.swift; sourceTree = ""; }; - 81D300671C93AF7300E1A1ED /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 81D300751C93AF9F00E1A1ED /* ExecutorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExecutorTests.swift; sourceTree = ""; }; - 81D300761C93AF9F00E1A1ED /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 81D300771C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TaskCompletionSourceTests.swift; sourceTree = ""; }; - 81D300781C93AF9F00E1A1ED /* TaskTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TaskTests.swift; sourceTree = ""; }; - 87FEF3661A9085FA00C60678 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 87FEF3711A9085FA00C60678 /* BoltsSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BoltsSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - F569C0C01CFF6A07000749B6 /* Task+ContinueWith.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Task+ContinueWith.swift"; sourceTree = ""; }; - F569C0CB1CFF6AEE000749B6 /* Task+Delay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Task+Delay.swift"; sourceTree = ""; }; - F569C0D61CFF6B18000749B6 /* Task+WhenAll.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Task+WhenAll.swift"; sourceTree = ""; }; - F569C0E01CFF6B1F000749B6 /* Task+WhenAny.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Task+WhenAny.swift"; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 065894E31C9A933B000FDDA6 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 065894F91C9A93B7000FDDA6 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 065895151C9A947B000FDDA6 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 0658951F1C9A9496000FDDA6 /* BoltsSwift.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 81CC14E81A9BE0A100B28F86 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 81CC14F31A9BE0A100B28F86 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 81CC14F71A9BE0A100B28F86 /* BoltsSwift.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 87FEF3621A9085FA00C60678 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 87FEF36E1A9085FA00C60678 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 87FEF3721A9085FA00C60678 /* BoltsSwift.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 812DB5261D3597BF00552C9F /* Configurations */ = { - isa = PBXGroup; - children = ( - 812DB5271D3597BF00552C9F /* BoltsSwift-iOS.xcconfig */, - 812DB5281D3597BF00552C9F /* BoltsSwift-macOS.xcconfig */, - 812DB5291D3597BF00552C9F /* BoltsSwift-tvOS.xcconfig */, - 812DB52A1D3597BF00552C9F /* BoltsSwift-watchOS.xcconfig */, - 812DB52B1D3597BF00552C9F /* BoltsSwiftTests-iOS.xcconfig */, - 812DB52C1D3597BF00552C9F /* BoltsSwiftTests-macOS.xcconfig */, - 812DB52D1D3597BF00552C9F /* BoltsSwiftTests-tvOS.xcconfig */, - 81951A901D46BA2F00958108 /* Version.xcconfig */, - 812DB52E1D3597BF00552C9F /* Shared */, - ); - path = Configurations; - sourceTree = ""; - }; - 812DB52E1D3597BF00552C9F /* Shared */ = { - isa = PBXGroup; - children = ( - 812DB52F1D3597BF00552C9F /* Common.xcconfig */, - 812DB5301D3597BF00552C9F /* Platform */, - 812DB5351D3597BF00552C9F /* Product */, - 812DB53A1D3597BF00552C9F /* Project */, - 812DB53D1D3597BF00552C9F /* Warnings.xcconfig */, - ); - path = Shared; - sourceTree = ""; - }; - 812DB5301D3597BF00552C9F /* Platform */ = { - isa = PBXGroup; - children = ( - 812DB5311D3597BF00552C9F /* iOS.xcconfig */, - 812DB5321D3597BF00552C9F /* macOS.xcconfig */, - 812DB5331D3597BF00552C9F /* tvOS.xcconfig */, - 812DB5341D3597BF00552C9F /* watchOS.xcconfig */, - ); - path = Platform; - sourceTree = ""; - }; - 812DB5351D3597BF00552C9F /* Product */ = { - isa = PBXGroup; - children = ( - 812DB5361D3597BF00552C9F /* Application.xcconfig */, - 812DB5371D3597BF00552C9F /* DynamicFramework.xcconfig */, - 812DB5381D3597BF00552C9F /* LogicTests.xcconfig */, - 812DB5391D3597BF00552C9F /* StaticFramework.xcconfig */, - ); - path = Product; - sourceTree = ""; - }; - 812DB53A1D3597BF00552C9F /* Project */ = { - isa = PBXGroup; - children = ( - 812DB53B1D3597BF00552C9F /* Debug.xcconfig */, - 812DB53C1D3597BF00552C9F /* Release.xcconfig */, - ); - path = Project; - sourceTree = ""; - }; - 81D300611C93AF7300E1A1ED /* Sources */ = { - isa = PBXGroup; - children = ( - 81D300621C93AF7300E1A1ED /* BoltsSwift */, - 81D300731C93AF8C00E1A1ED /* Supporting Files */, - ); - path = Sources; - sourceTree = ""; - }; - 81D300621C93AF7300E1A1ED /* BoltsSwift */ = { - isa = PBXGroup; - children = ( - 81D300651C93AF7300E1A1ED /* Task.swift */, - 81D300661C93AF7300E1A1ED /* TaskCompletionSource.swift */, - F569C0C01CFF6A07000749B6 /* Task+ContinueWith.swift */, - F569C0CB1CFF6AEE000749B6 /* Task+Delay.swift */, - F569C0D61CFF6B18000749B6 /* Task+WhenAll.swift */, - F569C0E01CFF6B1F000749B6 /* Task+WhenAny.swift */, - 81D300641C93AF7300E1A1ED /* Executor.swift */, - 81D300631C93AF7300E1A1ED /* Errors.swift */, - ); - path = BoltsSwift; - sourceTree = ""; - }; - 81D300731C93AF8C00E1A1ED /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 81D300671C93AF7300E1A1ED /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 81D300741C93AF9F00E1A1ED /* Tests */ = { - isa = PBXGroup; - children = ( - 81D300781C93AF9F00E1A1ED /* TaskTests.swift */, - 81D300771C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift */, - 81D300751C93AF9F00E1A1ED /* ExecutorTests.swift */, - 810AB31F1C9B1AC3005B6184 /* XCTestCase+TestName.swift */, - 81D300811C93AFA600E1A1ED /* Supporting Files */, - ); - path = Tests; - sourceTree = ""; - }; - 81D300811C93AFA600E1A1ED /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 81D300761C93AF9F00E1A1ED /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 87FEF35C1A9085FA00C60678 = { - isa = PBXGroup; - children = ( - 812DB5261D3597BF00552C9F /* Configurations */, - 81D300611C93AF7300E1A1ED /* Sources */, - 81D300741C93AF9F00E1A1ED /* Tests */, - 87FEF3671A9085FA00C60678 /* Products */, - ); - indentWidth = 4; - sourceTree = ""; - tabWidth = 4; - }; - 87FEF3671A9085FA00C60678 /* Products */ = { - isa = PBXGroup; - children = ( - 87FEF3661A9085FA00C60678 /* BoltsSwift.framework */, - 87FEF3711A9085FA00C60678 /* BoltsSwiftTests.xctest */, - 81CC14EC1A9BE0A100B28F86 /* BoltsSwift.framework */, - 81CC14F61A9BE0A100B28F86 /* BoltsSwiftTests.xctest */, - 065894E71C9A933B000FDDA6 /* BoltsSwift.framework */, - 065894FF1C9A93B7000FDDA6 /* BoltsSwift.framework */, - 0658951B1C9A947B000FDDA6 /* BoltsSwiftTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 065894E41C9A933B000FDDA6 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 065894FA1C9A93B7000FDDA6 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 81CC14E91A9BE0A100B28F86 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 87FEF3631A9085FA00C60678 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 065894E61C9A933B000FDDA6 /* BoltsSwift-watchOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 065894EE1C9A933B000FDDA6 /* Build configuration list for PBXNativeTarget "BoltsSwift-watchOS" */; - buildPhases = ( - 065894E21C9A933B000FDDA6 /* Sources */, - 065894E31C9A933B000FDDA6 /* Frameworks */, - 065894E41C9A933B000FDDA6 /* Headers */, - 065894E51C9A933B000FDDA6 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "BoltsSwift-watchOS"; - productName = "BoltsSwift-watchOS"; - productReference = 065894E71C9A933B000FDDA6 /* BoltsSwift.framework */; - productType = "com.apple.product-type.framework"; - }; - 065894F31C9A93B7000FDDA6 /* BoltsSwift-tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 065894FC1C9A93B7000FDDA6 /* Build configuration list for PBXNativeTarget "BoltsSwift-tvOS" */; - buildPhases = ( - 065894F41C9A93B7000FDDA6 /* Sources */, - 065894F91C9A93B7000FDDA6 /* Frameworks */, - 065894FA1C9A93B7000FDDA6 /* Headers */, - 065894FB1C9A93B7000FDDA6 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "BoltsSwift-tvOS"; - productName = Bolts; - productReference = 065894FF1C9A93B7000FDDA6 /* BoltsSwift.framework */; - productType = "com.apple.product-type.framework"; - }; - 0658950E1C9A947B000FDDA6 /* BoltsSwiftTests-tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 065895181C9A947B000FDDA6 /* Build configuration list for PBXNativeTarget "BoltsSwiftTests-tvOS" */; - buildPhases = ( - 065895111C9A947B000FDDA6 /* Sources */, - 065895151C9A947B000FDDA6 /* Frameworks */, - 065895171C9A947B000FDDA6 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 0658951E1C9A948E000FDDA6 /* PBXTargetDependency */, - ); - name = "BoltsSwiftTests-tvOS"; - productName = BoltsTests; - productReference = 0658951B1C9A947B000FDDA6 /* BoltsSwiftTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 81CC14EB1A9BE0A100B28F86 /* BoltsSwift-macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 81CC14FF1A9BE0A100B28F86 /* Build configuration list for PBXNativeTarget "BoltsSwift-macOS" */; - buildPhases = ( - 81CC14E71A9BE0A100B28F86 /* Sources */, - 81CC14E81A9BE0A100B28F86 /* Frameworks */, - 81CC14E91A9BE0A100B28F86 /* Headers */, - 81CC14EA1A9BE0A100B28F86 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "BoltsSwift-macOS"; - productName = "Bolts-Mac"; - productReference = 81CC14EC1A9BE0A100B28F86 /* BoltsSwift.framework */; - productType = "com.apple.product-type.framework"; - }; - 81CC14F51A9BE0A100B28F86 /* BoltsSwiftTests-macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 81CC15021A9BE0A100B28F86 /* Build configuration list for PBXNativeTarget "BoltsSwiftTests-macOS" */; - buildPhases = ( - 81CC14F21A9BE0A100B28F86 /* Sources */, - 81CC14F31A9BE0A100B28F86 /* Frameworks */, - 81CC14F41A9BE0A100B28F86 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 81CC14F91A9BE0A100B28F86 /* PBXTargetDependency */, - ); - name = "BoltsSwiftTests-macOS"; - productName = "Bolts-MacTests"; - productReference = 81CC14F61A9BE0A100B28F86 /* BoltsSwiftTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 87FEF3651A9085FA00C60678 /* BoltsSwift-iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 87FEF37C1A9085FA00C60678 /* Build configuration list for PBXNativeTarget "BoltsSwift-iOS" */; - buildPhases = ( - 87FEF3611A9085FA00C60678 /* Sources */, - 87FEF3621A9085FA00C60678 /* Frameworks */, - 87FEF3631A9085FA00C60678 /* Headers */, - 87FEF3641A9085FA00C60678 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "BoltsSwift-iOS"; - productName = Bolts; - productReference = 87FEF3661A9085FA00C60678 /* BoltsSwift.framework */; - productType = "com.apple.product-type.framework"; - }; - 87FEF3701A9085FA00C60678 /* BoltsSwiftTests-iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 87FEF37F1A9085FA00C60678 /* Build configuration list for PBXNativeTarget "BoltsSwiftTests-iOS" */; - buildPhases = ( - 87FEF36D1A9085FA00C60678 /* Sources */, - 87FEF36E1A9085FA00C60678 /* Frameworks */, - 87FEF36F1A9085FA00C60678 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 87FEF3741A9085FA00C60678 /* PBXTargetDependency */, - ); - name = "BoltsSwiftTests-iOS"; - productName = BoltsTests; - productReference = 87FEF3711A9085FA00C60678 /* BoltsSwiftTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 87FEF35D1A9085FA00C60678 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftMigration = 0700; - LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0800; - ORGANIZATIONNAME = Facebook; - TargetAttributes = { - 065894E61C9A933B000FDDA6 = { - CreatedOnToolsVersion = 7.2.1; - }; - 81CC14EB1A9BE0A100B28F86 = { - CreatedOnToolsVersion = 6.3; - }; - 81CC14F51A9BE0A100B28F86 = { - CreatedOnToolsVersion = 6.3; - }; - 87FEF3651A9085FA00C60678 = { - CreatedOnToolsVersion = 6.3; - LastSwiftMigration = 0800; - }; - 87FEF3701A9085FA00C60678 = { - CreatedOnToolsVersion = 6.3; - LastSwiftMigration = 0800; - }; - }; - }; - buildConfigurationList = 87FEF3601A9085FA00C60678 /* Build configuration list for PBXProject "BoltsSwift" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = 87FEF35C1A9085FA00C60678; - productRefGroup = 87FEF3671A9085FA00C60678 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 87FEF3651A9085FA00C60678 /* BoltsSwift-iOS */, - 87FEF3701A9085FA00C60678 /* BoltsSwiftTests-iOS */, - 81CC14EB1A9BE0A100B28F86 /* BoltsSwift-macOS */, - 81CC14F51A9BE0A100B28F86 /* BoltsSwiftTests-macOS */, - 065894F31C9A93B7000FDDA6 /* BoltsSwift-tvOS */, - 0658950E1C9A947B000FDDA6 /* BoltsSwiftTests-tvOS */, - 065894E61C9A933B000FDDA6 /* BoltsSwift-watchOS */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 065894E51C9A933B000FDDA6 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 065894FB1C9A93B7000FDDA6 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 065895171C9A947B000FDDA6 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 81CC14EA1A9BE0A100B28F86 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 81CC14F41A9BE0A100B28F86 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 87FEF3641A9085FA00C60678 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 87FEF36F1A9085FA00C60678 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 065894E21C9A933B000FDDA6 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 065894F21C9A9391000FDDA6 /* Errors.swift in Sources */, - F569C0DA1CFF6B18000749B6 /* Task+WhenAll.swift in Sources */, - 065894EF1C9A9391000FDDA6 /* Task.swift in Sources */, - F569C0CF1CFF6AEE000749B6 /* Task+Delay.swift in Sources */, - F569C0C41CFF6A07000749B6 /* Task+ContinueWith.swift in Sources */, - F569C0E41CFF6B1F000749B6 /* Task+WhenAny.swift in Sources */, - 065894F11C9A9391000FDDA6 /* Executor.swift in Sources */, - 065894F01C9A9391000FDDA6 /* TaskCompletionSource.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 065894F41C9A93B7000FDDA6 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 065894F51C9A93B7000FDDA6 /* Executor.swift in Sources */, - F569C0D91CFF6B18000749B6 /* Task+WhenAll.swift in Sources */, - 065894F61C9A93B7000FDDA6 /* Task.swift in Sources */, - F569C0CE1CFF6AEE000749B6 /* Task+Delay.swift in Sources */, - F569C0C31CFF6A07000749B6 /* Task+ContinueWith.swift in Sources */, - F569C0E31CFF6B1F000749B6 /* Task+WhenAny.swift in Sources */, - 065894F71C9A93B7000FDDA6 /* Errors.swift in Sources */, - 065894F81C9A93B7000FDDA6 /* TaskCompletionSource.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 065895111C9A947B000FDDA6 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 065895121C9A947B000FDDA6 /* ExecutorTests.swift in Sources */, - 065895131C9A947B000FDDA6 /* TaskTests.swift in Sources */, - 065895141C9A947B000FDDA6 /* TaskCompletionSourceTests.swift in Sources */, - 810AB3221C9B1AC3005B6184 /* XCTestCase+TestName.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 81CC14E71A9BE0A100B28F86 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 81D3006B1C93AF7300E1A1ED /* Executor.swift in Sources */, - F569C0D81CFF6B18000749B6 /* Task+WhenAll.swift in Sources */, - 81D3006D1C93AF7300E1A1ED /* Task.swift in Sources */, - F569C0CD1CFF6AEE000749B6 /* Task+Delay.swift in Sources */, - F569C0C21CFF6A07000749B6 /* Task+ContinueWith.swift in Sources */, - F569C0E21CFF6B1F000749B6 /* Task+WhenAny.swift in Sources */, - 81D300691C93AF7300E1A1ED /* Errors.swift in Sources */, - 81D3006F1C93AF7300E1A1ED /* TaskCompletionSource.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 81CC14F21A9BE0A100B28F86 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 81D3007A1C93AF9F00E1A1ED /* ExecutorTests.swift in Sources */, - 81D300801C93AF9F00E1A1ED /* TaskTests.swift in Sources */, - 81D3007E1C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift in Sources */, - 810AB3211C9B1AC3005B6184 /* XCTestCase+TestName.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 87FEF3611A9085FA00C60678 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 81D3006A1C93AF7300E1A1ED /* Executor.swift in Sources */, - F569C0D71CFF6B18000749B6 /* Task+WhenAll.swift in Sources */, - 81D3006C1C93AF7300E1A1ED /* Task.swift in Sources */, - F569C0CC1CFF6AEE000749B6 /* Task+Delay.swift in Sources */, - F569C0C11CFF6A07000749B6 /* Task+ContinueWith.swift in Sources */, - F569C0E11CFF6B1F000749B6 /* Task+WhenAny.swift in Sources */, - 81D300681C93AF7300E1A1ED /* Errors.swift in Sources */, - 81D3006E1C93AF7300E1A1ED /* TaskCompletionSource.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 87FEF36D1A9085FA00C60678 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 81D300791C93AF9F00E1A1ED /* ExecutorTests.swift in Sources */, - 81D3007F1C93AF9F00E1A1ED /* TaskTests.swift in Sources */, - 81D3007D1C93AF9F00E1A1ED /* TaskCompletionSourceTests.swift in Sources */, - 810AB3201C9B1AC3005B6184 /* XCTestCase+TestName.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 0658951E1C9A948E000FDDA6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 065894F31C9A93B7000FDDA6 /* BoltsSwift-tvOS */; - targetProxy = 0658951D1C9A948E000FDDA6 /* PBXContainerItemProxy */; - }; - 81CC14F91A9BE0A100B28F86 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 81CC14EB1A9BE0A100B28F86 /* BoltsSwift-macOS */; - targetProxy = 81CC14F81A9BE0A100B28F86 /* PBXContainerItemProxy */; - }; - 87FEF3741A9085FA00C60678 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 87FEF3651A9085FA00C60678 /* BoltsSwift-iOS */; - targetProxy = 87FEF3731A9085FA00C60678 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 065894EC1C9A933B000FDDA6 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB52A1D3597BF00552C9F /* BoltsSwift-watchOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 065894ED1C9A933B000FDDA6 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB52A1D3597BF00552C9F /* BoltsSwift-watchOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 065894FD1C9A93B7000FDDA6 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB5291D3597BF00552C9F /* BoltsSwift-tvOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 065894FE1C9A93B7000FDDA6 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB5291D3597BF00552C9F /* BoltsSwift-tvOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 065895191C9A947B000FDDA6 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB52D1D3597BF00552C9F /* BoltsSwiftTests-tvOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 0658951A1C9A947B000FDDA6 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB52D1D3597BF00552C9F /* BoltsSwiftTests-tvOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 81CC15001A9BE0A100B28F86 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB5281D3597BF00552C9F /* BoltsSwift-macOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 81CC15011A9BE0A100B28F86 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB5281D3597BF00552C9F /* BoltsSwift-macOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 81CC15031A9BE0A100B28F86 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB52C1D3597BF00552C9F /* BoltsSwiftTests-macOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 81CC15041A9BE0A100B28F86 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB52C1D3597BF00552C9F /* BoltsSwiftTests-macOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 87FEF37A1A9085FA00C60678 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB53B1D3597BF00552C9F /* Debug.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 87FEF37B1A9085FA00C60678 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB53C1D3597BF00552C9F /* Release.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 87FEF37D1A9085FA00C60678 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB5271D3597BF00552C9F /* BoltsSwift-iOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 87FEF37E1A9085FA00C60678 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB5271D3597BF00552C9F /* BoltsSwift-iOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 87FEF3801A9085FA00C60678 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB52B1D3597BF00552C9F /* BoltsSwiftTests-iOS.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 87FEF3811A9085FA00C60678 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 812DB52B1D3597BF00552C9F /* BoltsSwiftTests-iOS.xcconfig */; - buildSettings = { - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 065894EE1C9A933B000FDDA6 /* Build configuration list for PBXNativeTarget "BoltsSwift-watchOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 065894EC1C9A933B000FDDA6 /* Debug */, - 065894ED1C9A933B000FDDA6 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 065894FC1C9A93B7000FDDA6 /* Build configuration list for PBXNativeTarget "BoltsSwift-tvOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 065894FD1C9A93B7000FDDA6 /* Debug */, - 065894FE1C9A93B7000FDDA6 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 065895181C9A947B000FDDA6 /* Build configuration list for PBXNativeTarget "BoltsSwiftTests-tvOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 065895191C9A947B000FDDA6 /* Debug */, - 0658951A1C9A947B000FDDA6 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 81CC14FF1A9BE0A100B28F86 /* Build configuration list for PBXNativeTarget "BoltsSwift-macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 81CC15001A9BE0A100B28F86 /* Debug */, - 81CC15011A9BE0A100B28F86 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 81CC15021A9BE0A100B28F86 /* Build configuration list for PBXNativeTarget "BoltsSwiftTests-macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 81CC15031A9BE0A100B28F86 /* Debug */, - 81CC15041A9BE0A100B28F86 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 87FEF3601A9085FA00C60678 /* Build configuration list for PBXProject "BoltsSwift" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 87FEF37A1A9085FA00C60678 /* Debug */, - 87FEF37B1A9085FA00C60678 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 87FEF37C1A9085FA00C60678 /* Build configuration list for PBXNativeTarget "BoltsSwift-iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 87FEF37D1A9085FA00C60678 /* Debug */, - 87FEF37E1A9085FA00C60678 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 87FEF37F1A9085FA00C60678 /* Build configuration list for PBXNativeTarget "BoltsSwiftTests-iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 87FEF3801A9085FA00C60678 /* Debug */, - 87FEF3811A9085FA00C60678 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 87FEF35D1A9085FA00C60678 /* Project object */; -} diff --git a/Sources/BoltsSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Sources/BoltsSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 9789c2c8..00000000 --- a/Sources/BoltsSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 5bf47fcc..de259dcd 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -785,7 +785,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; ONLY_ACTIVE_ARCH = YES; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 4.2; @@ -820,7 +820,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.2; @@ -842,7 +842,7 @@ INFOPLIST_FILE = ParseLiveQuery/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -867,7 +867,7 @@ INFOPLIST_FILE = ParseLiveQuery/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -892,6 +892,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MARKETING_VERSION = 2.7.1; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; @@ -919,6 +920,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MARKETING_VERSION = 2.7.1; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; diff --git a/Sources/ParseLiveQuery/Info.plist b/Sources/ParseLiveQuery/Info.plist index 5f55083b..241468ad 100644 --- a/Sources/ParseLiveQuery/Info.plist +++ b/Sources/ParseLiveQuery/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.6.1 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion From 5479191d58ae1bf1113bb3e97643f9430d62203d Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Tue, 17 Sep 2019 22:00:37 -0500 Subject: [PATCH 30/45] Lets try this again. --- .gitmodules | 15 +++++++++++++++ Cartfile.resolved | 5 +++++ Carthage/Checkouts/Bolts-ObjC | 1 + Carthage/Checkouts/Bolts-Swift | 1 + Carthage/Checkouts/Parse-SDK-iOS-OSX | 1 + Carthage/Checkouts/Starscream | 1 + Carthage/Checkouts/facebook-objc-sdk | 1 + 7 files changed, 25 insertions(+) create mode 100644 .gitmodules create mode 100644 Cartfile.resolved create mode 160000 Carthage/Checkouts/Bolts-ObjC create mode 160000 Carthage/Checkouts/Bolts-Swift create mode 160000 Carthage/Checkouts/Parse-SDK-iOS-OSX create mode 160000 Carthage/Checkouts/Starscream create mode 160000 Carthage/Checkouts/facebook-objc-sdk diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..af7a675b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[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 diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 00000000..93c25b02 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,5 @@ +github "BoltsFramework/Bolts-ObjC" "1.9.0" +github "BoltsFramework/Bolts-Swift" "1.4.0" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.3" +github "daltoniam/Starscream" "3.0.5" +github "facebook/facebook-objc-sdk" "v5.6.0" diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC new file mode 160000 index 00000000..4dc65427 --- /dev/null +++ b/Carthage/Checkouts/Bolts-ObjC @@ -0,0 +1 @@ +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift new file mode 160000 index 00000000..e7811181 --- /dev/null +++ b/Carthage/Checkouts/Bolts-Swift @@ -0,0 +1 @@ +Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX new file mode 160000 index 00000000..44397810 --- /dev/null +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -0,0 +1 @@ +Subproject commit 4439781088ac62e9524fd0167b83490571625fb7 diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream new file mode 160000 index 00000000..114e5df9 --- /dev/null +++ b/Carthage/Checkouts/Starscream @@ -0,0 +1 @@ +Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9 diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk new file mode 160000 index 00000000..cf9e0d83 --- /dev/null +++ b/Carthage/Checkouts/facebook-objc-sdk @@ -0,0 +1 @@ +Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 From 5e01f2d6d754095ab3e0b8d7142d570ed101fd0b Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Tue, 17 Sep 2019 22:11:24 -0500 Subject: [PATCH 31/45] Updating deployment target. --- Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj | 4 ++-- Examples/LiveQueryDemo.xcodeproj/project.pbxproj | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj index 195abb43..7b374389 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj @@ -311,7 +311,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -360,7 +360,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; }; diff --git a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj index 41fee527..e36d8cd1 100644 --- a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj @@ -224,6 +224,7 @@ 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; @@ -239,6 +240,7 @@ 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; From f3d4cf81d040de00a6d64762628fa2816cc3edb2 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Thu, 28 Nov 2019 21:08:45 +0100 Subject: [PATCH 32/45] Fixes macOS test --- Cartfile.resolved | 2 +- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 93c25b02..c0ddffef 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -2,4 +2,4 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "BoltsFramework/Bolts-Swift" "1.4.0" github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.3" github "daltoniam/Starscream" "3.0.5" -github "facebook/facebook-objc-sdk" "v5.6.0" +github "facebook/facebook-objc-sdk" "v5.11.1" diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index de259dcd..e5b338fa 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -218,6 +218,13 @@ remoteGlobalIDString = 81C582E11C3B0A98000063C6; remoteInfo = "Parse-iOS-Dynamic"; }; + BCC3A76423905FDF0082C2A3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 97010FAB1630B18F00AB761E; + remoteInfo = "Parse-macOS"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -232,7 +239,6 @@ 094AE9051E25AF5A00F408BC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = ../../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 09A31C841E25C5100037C3BC /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; @@ -305,7 +311,6 @@ 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */, 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */, 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */, - 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */, 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */, 09A31C841E25C5100037C3BC /* Parse.framework */, 094AE9011E25AF3A00F408BC /* Foundation.framework */, @@ -453,6 +458,7 @@ buildRules = ( ); dependencies = ( + BCC3A76523905FDF0082C2A3 /* PBXTargetDependency */, ); name = "ParseLiveQuery-OSX"; productName = ParseLiveQuery; @@ -753,6 +759,11 @@ name = "Parse-iOS-Dynamic"; targetProxy = 4ABA29F9205C346700ABF9CB /* PBXContainerItemProxy */; }; + BCC3A76523905FDF0082C2A3 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Parse-macOS"; + targetProxy = BCC3A76423905FDF0082C2A3 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ From 2135ec328dc769b70313d0233a73e47706eb0e3b Mon Sep 17 00:00:00 2001 From: Darren Black Date: Thu, 28 Nov 2019 21:26:31 +0100 Subject: [PATCH 33/45] Updates ruby version?? --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 4560fb91..4a23e280 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.6.3 +ruby-2.6.3p62 From c8c895ffe7405e3cdf75c450fc6cea0f45d2b108 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Thu, 28 Nov 2019 21:34:00 +0100 Subject: [PATCH 34/45] Reverts .ruby-version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 4a23e280..4560fb91 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.6.3p62 +ruby-2.6.3 From 02b22c8168a0474a17c1f8c4c10377f2fb5fc8c7 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 29 Nov 2019 10:35:11 +0100 Subject: [PATCH 35/45] Updates Xcode version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8dec1a5a..aa316f23 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults macos: - xcode: "11.0.0" + xcode: "11.2.1" shell: /bin/bash --login -eo pipefail aliases: - &prepare From 7a7f13292ea1b5d3a5f3ad9438a94bd36096a400 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 29 Nov 2019 10:42:53 +0100 Subject: [PATCH 36/45] Uses sudo when installing bundler --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa316f23..787cc179 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ aliases: - &prepare | git submodule update --init --recursive - gem install bundler + sudo gem install bundler bundle install - &filter-only-master branches: From a5cf1907987914561f507f5accf7e6f3cf3febb2 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 29 Nov 2019 12:03:45 +0100 Subject: [PATCH 37/45] Specifies Bolts-Swift dependencies --- .../contents.xcworkspacedata | 3 - .../ParseLiveQuery.xcodeproj/project.pbxproj | 144 ++++++++++++++++++ 2 files changed, 144 insertions(+), 3 deletions(-) diff --git a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata index 9f6431ca..83076ce3 100644 --- a/ParseLiveQuery.xcworkspace/contents.xcworkspacedata +++ b/ParseLiveQuery.xcworkspace/contents.xcworkspacedata @@ -14,7 +14,4 @@ location = "group:Examples/LiveQueryDemo.xcodeproj"> - - diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index e5b338fa..aed38595 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -218,6 +218,69 @@ remoteGlobalIDString = 81C582E11C3B0A98000063C6; remoteInfo = "Parse-iOS-Dynamic"; }; + BC2D679E239131E500DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 87FEF3661A9085FA00C60678; + remoteInfo = "BoltsSwift-iOS"; + }; + BC2D67A0239131E500DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 87FEF3711A9085FA00C60678; + remoteInfo = "BoltsSwiftTests-iOS"; + }; + BC2D67A2239131E500DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81CC14EC1A9BE0A100B28F86; + remoteInfo = "BoltsSwift-macOS"; + }; + BC2D67A4239131E500DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 81CC14F61A9BE0A100B28F86; + remoteInfo = "BoltsSwiftTests-macOS"; + }; + BC2D67A6239131E500DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 065894FF1C9A93B7000FDDA6; + remoteInfo = "BoltsSwift-tvOS"; + }; + BC2D67A8239131E500DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 0658951B1C9A947B000FDDA6; + remoteInfo = "BoltsSwiftTests-tvOS"; + }; + BC2D67AA239131E500DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 065894E71C9A933B000FDDA6; + remoteInfo = "BoltsSwift-watchOS"; + }; + BC2D67B62391320F00DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 81CC14EB1A9BE0A100B28F86; + remoteInfo = "BoltsSwift-macOS"; + }; + BC2D67B82391321700DC849E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 87FEF3651A9085FA00C60678; + remoteInfo = "BoltsSwift-iOS"; + }; BCC3A76423905FDF0082C2A3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; @@ -249,6 +312,7 @@ 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoltsSwift.xcodeproj; path = "../Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"; sourceTree = ""; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F534A5B11BDAFE0200CBD11A /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; F534A5B31BDB09CE00CBD11A /* Operation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operation.swift; sourceTree = ""; }; @@ -377,11 +441,26 @@ name = Resources; sourceTree = ""; }; + BC2D678A239131E500DC849E /* Products */ = { + isa = PBXGroup; + children = ( + BC2D679F239131E500DC849E /* BoltsSwift.framework */, + BC2D67A1239131E500DC849E /* BoltsSwiftTests.xctest */, + BC2D67A3239131E500DC849E /* BoltsSwift.framework */, + BC2D67A5239131E500DC849E /* BoltsSwiftTests.xctest */, + BC2D67A7239131E500DC849E /* BoltsSwift.framework */, + BC2D67A9239131E500DC849E /* BoltsSwiftTests.xctest */, + BC2D67AB239131E500DC849E /* BoltsSwift.framework */, + ); + name = Products; + sourceTree = ""; + }; F5256FC41BD71F9A0052FB8A = { isa = PBXGroup; children = ( F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, F5256FCF1BD71F9A0052FB8A /* Products */, + BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */, 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */, 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */, 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */, @@ -458,6 +537,7 @@ buildRules = ( ); dependencies = ( + BC2D67B72391320F00DC849E /* PBXTargetDependency */, BCC3A76523905FDF0082C2A3 /* PBXTargetDependency */, ); name = "ParseLiveQuery-OSX"; @@ -477,6 +557,7 @@ buildRules = ( ); dependencies = ( + BC2D67B92391321700DC849E /* PBXTargetDependency */, 4ABA29FA205C346700ABF9CB /* PBXTargetDependency */, ); name = "ParseLiveQuery-iOS"; @@ -518,6 +599,10 @@ ProductGroup = 4A6AE338200FB569007CA404 /* Products */; ProjectRef = 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */; }, + { + ProductGroup = BC2D678A239131E500DC849E /* Products */; + ProjectRef = BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */; + }, { ProductGroup = 4A6AE30C200FB23E007CA404 /* Products */; ProjectRef = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */; @@ -697,6 +782,55 @@ remoteRef = 4A6AE37C200FC9C5007CA404 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + BC2D679F239131E500DC849E /* BoltsSwift.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = BoltsSwift.framework; + remoteRef = BC2D679E239131E500DC849E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BC2D67A1239131E500DC849E /* BoltsSwiftTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = BoltsSwiftTests.xctest; + remoteRef = BC2D67A0239131E500DC849E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BC2D67A3239131E500DC849E /* BoltsSwift.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = BoltsSwift.framework; + remoteRef = BC2D67A2239131E500DC849E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BC2D67A5239131E500DC849E /* BoltsSwiftTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = BoltsSwiftTests.xctest; + remoteRef = BC2D67A4239131E500DC849E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BC2D67A7239131E500DC849E /* BoltsSwift.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = BoltsSwift.framework; + remoteRef = BC2D67A6239131E500DC849E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BC2D67A9239131E500DC849E /* BoltsSwiftTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = BoltsSwiftTests.xctest; + remoteRef = BC2D67A8239131E500DC849E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BC2D67AB239131E500DC849E /* BoltsSwift.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = BoltsSwift.framework; + remoteRef = BC2D67AA239131E500DC849E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -759,6 +893,16 @@ name = "Parse-iOS-Dynamic"; targetProxy = 4ABA29F9205C346700ABF9CB /* PBXContainerItemProxy */; }; + BC2D67B72391320F00DC849E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "BoltsSwift-macOS"; + targetProxy = BC2D67B62391320F00DC849E /* PBXContainerItemProxy */; + }; + BC2D67B92391321700DC849E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "BoltsSwift-iOS"; + targetProxy = BC2D67B82391321700DC849E /* PBXContainerItemProxy */; + }; BCC3A76523905FDF0082C2A3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "Parse-macOS"; From 6bb89fb9ae69da1d4587893664b19e28f9df356a Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 29 Nov 2019 14:02:25 +0100 Subject: [PATCH 38/45] Prunes unused, old libraries / frameworks --- .../ParseLiveQuery.xcodeproj/project.pbxproj | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index aed38595..1bfe2bd4 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -9,24 +9,13 @@ /* Begin PBXBuildFile section */ 0632EDD41CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */; }; 0632EDD51CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */; }; - 094AE8F01E25ADF300F408BC /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8EF1E25ADF300F408BC /* libicucore.tbd */; }; - 094AE8F21E25AE0500F408BC /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8F11E25AE0500F408BC /* CFNetwork.framework */; }; - 094AE8F41E25AE1100F408BC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8F31E25AE1100F408BC /* Security.framework */; }; - 094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8F51E25AE1C00F408BC /* Foundation.framework */; }; 094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE8FF1E25AF3100F408BC /* libicucore.tbd */; }; 094AE9021E25AF3A00F408BC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9011E25AF3A00F408BC /* Foundation.framework */; }; 094AE9041E25AF4300F408BC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9031E25AF4300F408BC /* Security.framework */; }; - 094AE9061E25AF5A00F408BC /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9051E25AF5A00F408BC /* CFNetwork.framework */; }; - 09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C841E25C5100037C3BC /* Parse.framework */; }; - 09C9FCE41E25D08400369AA6 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */; }; - 09D80FD81E26BF0500AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */; }; - 09D80FDA1E26BFAA00AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */; }; - 09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */; }; 09D80FDE1E26C03E00AC7A2D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */; }; 09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; }; 09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; }; 4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE319200FB23E007CA404 /* Parse.framework */; }; - 4A6AE361200FC9C5007CA404 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */; }; 4A6AE37E200FC9DF007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; }; 4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; }; 4A819D9D1D937866009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; @@ -292,26 +281,15 @@ /* Begin PBXFileReference section */ 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; sourceTree = ""; }; - 094AE8EF1E25ADF300F408BC /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libicucore.tbd; sourceTree = DEVELOPER_DIR; }; - 094AE8F11E25AE0500F408BC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; }; - 094AE8F31E25AE1100F408BC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; - 094AE8F51E25AE1C00F408BC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 094AE8FF1E25AF3100F408BC /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; }; 094AE9011E25AF3A00F408BC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 094AE9031E25AF4300F408BC /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - 094AE9051E25AF5A00F408BC /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = ../../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 09A31C841E25C5100037C3BC /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; }; - 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; - 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 4A1A99611E5E8DBB0047B84B /* Starscream.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Starscream.xcodeproj; path = ../Carthage/Checkouts/Starscream/Starscream.xcodeproj; sourceTree = ""; }; 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "../Carthage/Checkouts/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = ""; }; 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; - 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BoltsSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoltsSwift.xcodeproj; path = "../Carthage/Checkouts/Bolts-Swift/BoltsSwift.xcodeproj"; sourceTree = ""; }; F5256FD31BD71F9A0052FB8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F534A5B11BDAFE0200CBD11A /* Subscription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = ""; }; @@ -337,11 +315,8 @@ 09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */, 09D80FDE1E26C03E00AC7A2D /* SystemConfiguration.framework in Frameworks */, 094AE9021E25AF3A00F408BC /* Foundation.framework in Frameworks */, - 09C9FCE41E25D08400369AA6 /* BoltsSwift.framework in Frameworks */, - 094AE9061E25AF5A00F408BC /* CFNetwork.framework in Frameworks */, 094AE9041E25AF4300F408BC /* Security.framework in Frameworks */, 094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */, - 09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -350,15 +325,7 @@ buildActionMask = 2147483647; files = ( 4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */, - 4A6AE361200FC9C5007CA404 /* BoltsSwift.framework in Frameworks */, 4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */, - 09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */, - 094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */, - 094AE8F41E25AE1100F408BC /* Security.framework in Frameworks */, - 094AE8F21E25AE0500F408BC /* CFNetwork.framework in Frameworks */, - 09D80FDA1E26BFAA00AC7A2D /* AudioToolbox.framework in Frameworks */, - 09D80FD81E26BF0500AC7A2D /* libsqlite3.tbd in Frameworks */, - 094AE8F01E25ADF300F408BC /* libicucore.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -368,23 +335,12 @@ 0BD13CAB7945A6C1A2A7B613 /* Frameworks */ = { isa = PBXGroup; children = ( - 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */, 09D80FDD1E26C03E00AC7A2D /* SystemConfiguration.framework */, - 09D80FDB1E26C02600AC7A2D /* SystemConfiguration.framework */, - 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */, 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */, - 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */, 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */, - 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */, - 09A31C841E25C5100037C3BC /* Parse.framework */, 094AE9011E25AF3A00F408BC /* Foundation.framework */, - 094AE8F51E25AE1C00F408BC /* Foundation.framework */, 094AE9031E25AF4300F408BC /* Security.framework */, - 094AE8F31E25AE1100F408BC /* Security.framework */, - 094AE9051E25AF5A00F408BC /* CFNetwork.framework */, - 094AE8F11E25AE0500F408BC /* CFNetwork.framework */, 094AE8FF1E25AF3100F408BC /* libicucore.tbd */, - 094AE8EF1E25ADF300F408BC /* libicucore.tbd */, ); name = Frameworks; sourceTree = ""; From 89765582d3b224c4abead582e623e72faf103d2d Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 29 Nov 2019 14:47:53 +0100 Subject: [PATCH 39/45] Updates podspec --- ParseLiveQuery.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index bb17e4e2..77e685e6 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ParseLiveQuery' - s.version = '2.7.0' + s.version = '2.7.1' s.license = { :type => 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'http://parseplatform.org' @@ -12,12 +12,12 @@ Pod::Spec.new do |s| s.requires_arc = true s.platform = :ios, :osx, :tvos - s.swift_version = '5.0' + s.swift_version = '4.2' s.cocoapods_version = '>= 1.4' s.ios.deployment_target = '8.0' - s.tvos.deployment_target = '9.0' - s.osx.deployment_target = '10.10' + s.tvos.deployment_target = '10.0' + s.osx.deployment_target = '10.12' s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' From b870e0d5a380414107e55fd388c3da9deb70f49a Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 29 Nov 2019 17:05:25 +0100 Subject: [PATCH 40/45] Updates to Swift 5, Bolts-Swift 1.5.0 Updates project to Xcode 11 recommended settings --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Bolts-Swift | 2 +- .../xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme | 2 +- Examples/LiveQueryDemo.xcodeproj/project.pbxproj | 6 +++--- .../xcshareddata/xcschemes/LiveQueryDemo.xcscheme | 2 +- ParseLiveQuery.podspec | 2 +- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 10 +++++++++- .../xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme | 2 +- .../xcshareddata/xcschemes/ParseLiveQuery-iOS.xcscheme | 2 +- 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Cartfile b/Cartfile index 6a9b2ff4..babc0d34 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -github "BoltsFramework/Bolts-Swift" == 1.4.0 +github "BoltsFramework/Bolts-Swift" == 1.5.0 github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.3 github "daltoniam/Starscream" == 3.0.5 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index c0ddffef..48e6a5c0 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "BoltsFramework/Bolts-Swift" "1.4.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" diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift index e7811181..d8c07eee 160000 --- a/Carthage/Checkouts/Bolts-Swift +++ b/Carthage/Checkouts/Bolts-Swift @@ -1 +1 @@ -Subproject commit e7811181243e9dfa9462ec3048cd5957519fa26f +Subproject commit d8c07eee2045a13f34330c0a4664053b5176e3f0 diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme b/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme index 0ff09a0b..6e7915b7 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/xcshareddata/xcschemes/LiveQueryDemo-ObjC.xcscheme @@ -1,6 +1,6 @@ 1.17.3' - s.dependency 'Bolts-Swift', '~> 1.4.0' + s.dependency 'Bolts-Swift', '~> 1.5.0' s.dependency 'Starscream', '~> 3.1.0' s.dependency 'Bolts', '~> 1.9.0' diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 1bfe2bd4..179392b8 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -527,7 +527,7 @@ F5256FC51BD71F9A0052FB8A /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1120; ORGANIZATIONNAME = Parse; TargetAttributes = { F5903CE91BD999C500C3EFFE = { @@ -875,11 +875,13 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -911,11 +913,13 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -943,6 +947,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGNING_REQUIRED = NO; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -968,6 +973,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGNING_REQUIRED = NO; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -992,6 +998,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGNING_REQUIRED = NO; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1020,6 +1027,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGNING_REQUIRED = NO; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme index 1e238ed1..71c9ab19 100644 --- a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme +++ b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-OSX.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 29 Nov 2019 17:12:21 +0100 Subject: [PATCH 41/45] ... podspec swift version --- ParseLiveQuery.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 008c5a43..8bf7ee47 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.platform = :ios, :osx, :tvos - s.swift_version = '4.2' + s.swift_version = '5.0' s.cocoapods_version = '>= 1.4' s.ios.deployment_target = '8.0' From 80bc06496027283c17328658a7259e5dab65c2de Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 29 Nov 2019 18:04:23 +0100 Subject: [PATCH 42/45] Sets version to 2.7.0 --- ParseLiveQuery.podspec | 2 +- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 8bf7ee47..54bc5802 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ParseLiveQuery' - s.version = '2.7.1' + s.version = '2.7.0' s.license = { :type => 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'http://parseplatform.org' diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 179392b8..dd70dbe3 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -959,6 +959,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 2.7.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -985,6 +986,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 2.7.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -1010,7 +1012,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 2.7.1; + MARKETING_VERSION = 2.7.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; @@ -1039,7 +1041,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 2.7.1; + MARKETING_VERSION = 2.7.0; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; From 8592bd3a2466a1ba76873be640bd7487cc096661 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Fri, 29 Nov 2019 19:40:14 +0100 Subject: [PATCH 43/45] Updates Changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3bf1340..0abba2ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.6.1...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, iOS 13 +- Moves to Parse SDK 1.17.3 +- Moves to Swift 5 +- Moves Bolts-Swift dependency to version 1.5.0 + ### 2.6.1 [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.6.0...2.6.1) From cf2be9750f443f03d0b559d01c5f17c7cc2cf192 Mon Sep 17 00:00:00 2001 From: Tom Fox <13188249+TomWFox@users.noreply.github.com> Date: Fri, 29 Nov 2019 18:44:23 +0000 Subject: [PATCH 44/45] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0abba2ac..e843fd5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,16 @@ ### 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, iOS 13 -- Moves to Parse SDK 1.17.3 +- Build compatibility with Xcode 11 and iOS 13 +- Bump Parse SDK to v1.17.3 - Moves to Swift 5 -- Moves Bolts-Swift dependency to version 1.5.0 +- Bump Bolts-Swift dependency to v1.5.0 ### 2.6.1 From fa3aad57e0ffcf2deb539d2ee3b7dd36e73b8894 Mon Sep 17 00:00:00 2001 From: Tom Fox <13188249+TomWFox@users.noreply.github.com> Date: Fri, 29 Nov 2019 18:52:53 +0000 Subject: [PATCH 45/45] Update CHANGELOG.md --- CHANGELOG.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e843fd5e..27d6208e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,11 @@ [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 -- Bump Parse SDK to v1.17.3 -- Moves to Swift 5 -- Bump Bolts-Swift dependency to v1.5.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 @@ -19,7 +20,7 @@ **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