From 2b027c1c2d67af6c841115ed3d860a9d91a16478 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 09:47:54 -0500 Subject: [PATCH 01/25] add watchOS support to cocoapods --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Parse-SDK-iOS-OSX | 2 +- ParseLiveQuery.podspec | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index 41c800aa..62665176 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-Swift" >= 1.5.0 -github "ParsePlatform/Parse-SDK-iOS-OSX" >= 1.19.0 +github "ParsePlatform/Parse-SDK-iOS-OSX" >= 1.19.1 github "daltoniam/Starscream" == 3.1.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index 7cc709d8..53bf59e0 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "BoltsFramework/Bolts-ObjC" "1.9.1" github "BoltsFramework/Bolts-Swift" "1.5.0" -github "ParsePlatform/Parse-SDK-iOS-OSX" "1.19.0" +github "ParsePlatform/Parse-SDK-iOS-OSX" "1.19.1" github "daltoniam/Starscream" "3.1.1" github "facebook/facebook-objc-sdk" "v6.5.2" diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX index 931684b3..9d1b958f 160000 --- a/Carthage/Checkouts/Parse-SDK-iOS-OSX +++ b/Carthage/Checkouts/Parse-SDK-iOS-OSX @@ -1 +1 @@ -Subproject commit 931684b3dce25ec447d3df38b02e988970663c24 +Subproject commit 9d1b958fc146312b06a571b4ee367106e0b0f9b2 diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index a5982290..00c39fa4 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -17,6 +17,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '8.0' s.tvos.deployment_target = '10.0' + s.watchos.deployment_target = '2.0' s.osx.deployment_target = '10.12' s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' @@ -24,6 +25,6 @@ Pod::Spec.new do |s| s.dependency 'Parse', '~> 1.19.0' s.dependency 'Bolts-Swift', '~> 1.5.0' - s.dependency 'Starscream', '3.1.0' + s.dependency 'Starscream', '~> 3.1.0' end From 70dcec2521a81187046283639fcdd595d6556089 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 10:31:12 -0500 Subject: [PATCH 02/25] add cache to CI and bump version numbers --- .circleci/config.yml | 21 ++++++++++++++++++- .travis.yml | 5 ++++- ParseLiveQuery.podspec | 4 ++-- .../ParseLiveQuery.xcodeproj/project.pbxproj | 8 +++---- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bca63bd6..cdc21e68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,6 +3,15 @@ defaults: &defaults xcode: "11.2.1" shell: /bin/bash --login -eo pipefail aliases: + - &cache-pull + keys: + - gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }} + - gem-cache-v1-{{ arch }}-{{ .Branch }} + - gem-cache-v1 + - &cache-push + key: gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }} + paths: + - vendor/bundle - &prepare | git submodule update --init --recursive @@ -19,7 +28,9 @@ jobs: <<: *defaults steps: - checkout + - restore_cache: *cache-pull - run: *prepare + - save_cache: *cache-push - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk iphonesimulator -scheme ParseLiveQuery-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 11,OS=13.2.2" 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: @@ -28,7 +39,9 @@ jobs: <<: *defaults steps: - checkout + - restore_cache: *cache-pull - run: *prepare + - save_cache: *cache-push - 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: @@ -37,7 +50,9 @@ jobs: <<: *defaults steps: - checkout + - restore_cache: *cache-pull - run: *prepare + - save_cache: *cache-push - run: | xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo | xcpretty -c; xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo -configuration Debug | xcpretty -c; @@ -48,17 +63,21 @@ jobs: <<: *defaults steps: - checkout + - restore_cache: *cache-pull - run: *prepare + - save_cache: *cache-push - run: carthage build --no-skip-current --platform macos,ios workflows: version: 2 pr: jobs: - - carthage - ios - macos - demo + - carthage + requires: + - ios nightly: jobs: - carthage diff --git a/.travis.yml b/.travis.yml index 6d4b3e42..258b6d0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,12 @@ branches: - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ cache: - cocoapods + directories: + - vendor/bundle install: - - bundle install + - bundle config set path 'vendor/bundle' + - travis_wait bundle install jobs: include: diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 00c39fa4..6a4ff042 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ParseLiveQuery' - s.version = '2.7.2' + s.version = '2.7.3' s.license = { :type => 'BSD' } s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.' s.homepage = 'http://parseplatform.org' @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse', '~> 1.19.0' + s.dependency 'Parse', '~> 1.19.1' s.dependency 'Bolts-Swift', '~> 1.5.0' s.dependency 'Starscream', '~> 3.1.0' diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 7719acaa..c1144a01 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -953,7 +953,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.2; + MARKETING_VERSION = 2.7.3; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -980,7 +980,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.2; + MARKETING_VERSION = 2.7.3; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; SDKROOT = macosx; @@ -1006,7 +1006,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.2; + MARKETING_VERSION = 2.7.3; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; @@ -1035,7 +1035,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.2; + MARKETING_VERSION = 2.7.3; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; From 679a1e553bb97556cbbaa0bd83a40ec5afc8bfe2 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 10:33:03 -0500 Subject: [PATCH 03/25] fix colon --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cdc21e68..62c7bcd6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,7 @@ workflows: - ios - macos - demo - - carthage + - carthage: requires: - ios nightly: From a20ca9efde22035b4cb1823c33fb48d4b6b56041 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 10:35:56 -0500 Subject: [PATCH 04/25] fix circle cache --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62c7bcd6..bb5df03f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,6 +16,7 @@ aliases: | git submodule update --init --recursive sudo gem install bundler + bundle config set path 'vendor/bundle' bundle install - &filter-only-master branches: From 73b54b520b659f794a811afbe953cd345a8b517b Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 10:42:54 -0500 Subject: [PATCH 05/25] current circle builds don't need bundle, no need to waste time with it --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb5df03f..12d5bf19 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: steps: - checkout - restore_cache: *cache-pull - - run: *prepare + #- run: *prepare - save_cache: *cache-push - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk iphonesimulator -scheme ParseLiveQuery-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 11,OS=13.2.2" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; - run: bash <(curl -s https://codecov.io/bash) @@ -41,7 +41,7 @@ jobs: steps: - checkout - restore_cache: *cache-pull - - run: *prepare + #- run: *prepare - save_cache: *cache-push - 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) @@ -52,7 +52,7 @@ jobs: steps: - checkout - restore_cache: *cache-pull - - run: *prepare + #- run: *prepare - save_cache: *cache-push - run: | xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo | xcpretty -c; @@ -65,7 +65,7 @@ jobs: steps: - checkout - restore_cache: *cache-pull - - run: *prepare + #- run: *prepare - save_cache: *cache-push - run: carthage build --no-skip-current --platform macos,ios From b5709a47bc637874470388230a3c95d1d0600ea1 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 11:39:39 -0500 Subject: [PATCH 06/25] add back bundle install --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 12d5bf19..bb5df03f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: steps: - checkout - restore_cache: *cache-pull - #- run: *prepare + - run: *prepare - save_cache: *cache-push - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk iphonesimulator -scheme ParseLiveQuery-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 11,OS=13.2.2" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; - run: bash <(curl -s https://codecov.io/bash) @@ -41,7 +41,7 @@ jobs: steps: - checkout - restore_cache: *cache-pull - #- run: *prepare + - run: *prepare - save_cache: *cache-push - 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) @@ -52,7 +52,7 @@ jobs: steps: - checkout - restore_cache: *cache-pull - #- run: *prepare + - run: *prepare - save_cache: *cache-push - run: | xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo | xcpretty -c; @@ -65,7 +65,7 @@ jobs: steps: - checkout - restore_cache: *cache-pull - #- run: *prepare + - run: *prepare - save_cache: *cache-push - run: carthage build --no-skip-current --platform macos,ios From 3177b6596001c2e815896577959ec1b94fc2f56a Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 11:45:37 -0500 Subject: [PATCH 07/25] fix travis cache --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 258b6d0c..75719c42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ branches: - master - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ cache: - - cocoapods directories: - vendor/bundle From 6cbb1dad943fb5565c9a9bfcf1a9c49af4787460 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 11:48:48 -0500 Subject: [PATCH 08/25] fix travis cache --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 75719c42..92d32ee8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ branches: - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ cache: directories: - - vendor/bundle + - vendor/bundle install: - bundle config set path 'vendor/bundle' From 49ae8a8125e3b0f18f75faa17e854ecaf98aa477 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 11:57:31 -0500 Subject: [PATCH 09/25] updates CI to 11.6 --- .circleci/config.yml | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb5df03f..53c21402 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ defaults: &defaults macos: - xcode: "11.2.1" + xcode: "11.6.0" shell: /bin/bash --login -eo pipefail aliases: - &cache-pull diff --git a/.travis.yml b/.travis.yml index 92d32ee8..abb5b645 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c os: osx -osx_image: xcode11.2 +osx_image: xcode11.6 branches: only: - master From 265b0699de1edad5a57832853fd9670731770a77 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Sun, 15 Nov 2020 12:09:45 -0500 Subject: [PATCH 10/25] remove OS req in circle build. Update gems --- .circleci/config.yml | 2 +- Gemfile | 4 +-- Gemfile.lock | 71 ++++++++++++++++++++++++-------------------- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53c21402..2f73e509 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: - restore_cache: *cache-pull - run: *prepare - save_cache: *cache-push - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -sdk iphonesimulator -scheme ParseLiveQuery-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 11,OS=13.2.2" 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 11" 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 diff --git a/Gemfile b/Gemfile index ff15c32e..f3acbb6a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,3 @@ source 'https://rubygems.org' -gem 'jazzy', '~> 0.11.1' -gem 'xcpretty' -gem 'cocoapods', '~> 1.8.4' +gem 'jazzy', '~> 0.13.6' diff --git a/Gemfile.lock b/Gemfile.lock index 084058a9..5bfcf247 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,25 +2,26 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.2) - activesupport (4.2.11.1) - i18n (~> 0.7) + activesupport (5.2.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.4) - activesupport (>= 4.0.2, < 5) + cocoapods (1.10.0) + addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.4) + cocoapods-core (= 1.10.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 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.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) @@ -30,34 +31,39 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.4) - activesupport (>= 4.0.2, < 6) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.0) + activesupport (> 5.0, < 6) + addressable (~> 2.6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) + netrc (~> 0.11) + public_suffix + typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.3.0) + cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.1) + cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) escape (0.0.4) - ffi (1.12.2) + ethon (0.12.0) + ffi (>= 1.3.0) + ffi (1.13.1) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.8.5) concurrent-ruby (~> 1.0) - jazzy (0.11.2) + jazzy (0.13.6) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -66,42 +72,41 @@ GEM sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) - json (2.3.0) + json (2.3.1) liferaft (0.0.6) - minitest (5.14.0) + minitest (5.14.2) molinillo (0.6.6) mustache (1.1.1) - nanaimo (0.2.6) + nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) open4 (1.3.4) + public_suffix (4.0.6) redcarpet (3.5.0) - rouge (2.0.7) + rouge (3.25.0) ruby-macho (1.4.0) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) sqlite3 (1.4.2) thread_safe (0.3.6) - tzinfo (1.2.7) + typhoeus (1.4.0) + ethon (>= 0.9.0) + tzinfo (1.2.8) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.16.0) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.6) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.3.0) PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.8.4) - jazzy (~> 0.11.1) - xcpretty + jazzy (~> 0.13.6) BUNDLED WITH 2.1.4 From 75299a6ca70ffa5167c82f0099d367bbb151646a Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 12:31:46 -0500 Subject: [PATCH 11/25] update travis --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index abb5b645..93b69d76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,13 @@ jobs: include: - stage: release env: CocoaPods - script: bundle exec pod lib lint --allow-warnings + script: + - bundle exec pod setup + - travis_wait bundle exec pod lib lint --allow-warnings deploy: provider: script - cleanup: false - script: bundle exec pod trunk push ParseLiveQuery.podspec --allow-warnings + skip_cleanup: true + script: travis_wait bundle exec pod trunk push ParseLiveQuery.podspec --allow-warnings on: tags: true all_branches: true @@ -30,7 +32,7 @@ jobs: script: bundle exec jazzy deploy: provider: pages - cleanup: false + skip_cleanup: true github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard local_dir: docs/ on: From 21d375babb6de59c3ed416411787b6d0fc37d475 Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Sun, 15 Nov 2020 12:57:21 -0500 Subject: [PATCH 12/25] update jazzy script --- .jazzy.yaml | 9 --------- .travis.yml | 2 +- jazzy.sh | 13 +++++++++++++ 3 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 .jazzy.yaml create mode 100755 jazzy.sh diff --git a/.jazzy.yaml b/.jazzy.yaml deleted file mode 100644 index 2dcea0ec..00000000 --- a/.jazzy.yaml +++ /dev/null @@ -1,9 +0,0 @@ -module: "ParseLiveQuery" -xcodebuild_arguments: ["-scheme","ParseLiveQuery-iOS"] -theme: "fullwidth" -skip_undocumented: true -clean: true -author_url: "http://parseplatform.org" -github_url: "https://github.com/parse-community/ParseLiveQuery-iOS-OSX" -root_url: "http://parseplatform.org/ParseLiveQuery-iOS-OSX/" -author: "Parse Community" diff --git a/.travis.yml b/.travis.yml index 93b69d76..c1c14326 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ jobs: all_branches: true - stage: release env: Docs - script: bundle exec jazzy + script: ./jazzy.sh deploy: provider: pages skip_cleanup: true diff --git a/jazzy.sh b/jazzy.sh new file mode 100755 index 00000000..44509659 --- /dev/null +++ b/jazzy.sh @@ -0,0 +1,13 @@ +ver=`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" Sources/ParseLiveQuery/Info.plist` +bundle exec jazzy \ +--clean \ +--author "Parse Community" \ +--author_url http://parseplatform.org \ +--github_url https://github.com/parse-community/ParseLiveQuery-iOS-OSX \ +--root-url http://parseplatform.org/ParseLiveQuery-iOS-OSX/ \ +--module-version ${ver} \ +--theme fullwidth \ +--skip-undocumented \ +--output ./docs \ +--build-tool-arguments -scheme,ParseLiveQuery-iOS \ +--module ParseLiveQuery \ From 647389facdbc1c60787a9e97ef9536fd3c0d9dee Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Sun, 15 Nov 2020 13:12:05 -0500 Subject: [PATCH 13/25] update travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1c14326..87e2ae22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,11 +29,12 @@ jobs: all_branches: true - stage: release env: Docs - script: ./jazzy.sh + script: + - ./jazzy.sh deploy: provider: pages skip_cleanup: true - github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard + github_token: $GITHUB_TOKEN local_dir: docs/ on: tags: true From 36ae812b77a097842a761868abcaf7620e24d07c Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Sun, 15 Nov 2020 13:58:56 -0500 Subject: [PATCH 14/25] latest working version of Jazzy. It won't build for jazzy >0.13.1 --- .travis.yml | 5 +++-- Gemfile | 2 +- Gemfile.lock | 4 ++-- jazzy.sh | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87e2ae22..86827614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,13 +29,14 @@ jobs: all_branches: true - stage: release env: Docs - script: + script: + - carthage boostrap --platform iOS - ./jazzy.sh deploy: provider: pages skip_cleanup: true github_token: $GITHUB_TOKEN - local_dir: docs/ + local_dir: ./docs/ on: tags: true all_branches: true diff --git a/Gemfile b/Gemfile index f3acbb6a..54f5ff46 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'jazzy', '~> 0.13.6' +gem 'jazzy', '0.13.1' diff --git a/Gemfile.lock b/Gemfile.lock index 5bfcf247..f7d328f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -63,7 +63,7 @@ GEM httpclient (2.8.3) i18n (1.8.5) concurrent-ruby (~> 1.0) - jazzy (0.13.6) + jazzy (0.13.1) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -106,7 +106,7 @@ PLATFORMS ruby DEPENDENCIES - jazzy (~> 0.13.6) + jazzy (= 0.13.1) BUNDLED WITH 2.1.4 diff --git a/jazzy.sh b/jazzy.sh index 44509659..8604e2cb 100755 --- a/jazzy.sh +++ b/jazzy.sh @@ -8,6 +8,6 @@ bundle exec jazzy \ --module-version ${ver} \ --theme fullwidth \ --skip-undocumented \ ---output ./docs \ ---build-tool-arguments -scheme,ParseLiveQuery-iOS \ +--output docs/api \ --module ParseLiveQuery \ +--build-tool-arguments -scheme,ParseLiveQuery-iOS \ From b9362d1c5a1f00fa4aa5ced8b4a071875f68af3f Mon Sep 17 00:00:00 2001 From: Corey MacBook Pro Date: Sun, 15 Nov 2020 14:01:21 -0500 Subject: [PATCH 15/25] revert travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86827614..e604b90a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ jobs: - stage: release env: Docs script: - - carthage boostrap --platform iOS - ./jazzy.sh deploy: provider: pages From f405228d8dd73696ff2e6a90c1b12c000beb9f7d Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 19:08:09 -0500 Subject: [PATCH 16/25] add watchOS and tvOS targets --- .circleci/config.yml | 22 + Sources/ParseLiveQuery-tvOS/Info.plist | 22 + .../ParseLiveQuery-tvOS/ParseLiveQuery_tvOS.h | 19 + Sources/ParseLiveQuery-watchOS/Info.plist | 22 + .../ParseLiveQuery_watchOS.h | 19 + .../ParseLiveQuery.xcodeproj/project.pbxproj | 387 ++++++++++++++++++ .../xcschemes/ParseLiveQuery-tvOS.xcscheme | 67 +++ .../xcschemes/ParseLiveQuery-watchOS.xcscheme | 67 +++ 8 files changed, 625 insertions(+) create mode 100644 Sources/ParseLiveQuery-tvOS/Info.plist create mode 100644 Sources/ParseLiveQuery-tvOS/ParseLiveQuery_tvOS.h create mode 100644 Sources/ParseLiveQuery-watchOS/Info.plist create mode 100644 Sources/ParseLiveQuery-watchOS/ParseLiveQuery_watchOS.h create mode 100644 Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-tvOS.xcscheme create mode 100644 Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-watchOS.xcscheme diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f73e509..57acb168 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,6 +47,28 @@ jobs: - run: bash <(curl -s https://codecov.io/bash) - store_test_results: path: build/reports + watchos: + <<: *defaults + steps: + - checkout + - restore_cache: *cache-pull + - run: *prepare + - save_cache: *cache-push + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-watchOS -configuration Debug -destination "platform=watchOS Simulator,name=Apple Watch Series 6 - 44mm" 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 + tvos: + <<: *defaults + steps: + - checkout + - restore_cache: *cache-pull + - run: *prepare + - save_cache: *cache-push + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-tvOS -configuration Debug -destination "platform=tvOS Simulator,name=Apple TV 4K" 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 demo: <<: *defaults steps: diff --git a/Sources/ParseLiveQuery-tvOS/Info.plist b/Sources/ParseLiveQuery-tvOS/Info.plist new file mode 100644 index 00000000..9bcb2444 --- /dev/null +++ b/Sources/ParseLiveQuery-tvOS/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/Sources/ParseLiveQuery-tvOS/ParseLiveQuery_tvOS.h b/Sources/ParseLiveQuery-tvOS/ParseLiveQuery_tvOS.h new file mode 100644 index 00000000..8f067e90 --- /dev/null +++ b/Sources/ParseLiveQuery-tvOS/ParseLiveQuery_tvOS.h @@ -0,0 +1,19 @@ +// +// ParseLiveQuery_tvOS.h +// ParseLiveQuery-tvOS +// +// Created by Corey Baker on 11/15/20. +// Copyright © 2020 Parse. All rights reserved. +// + +#import + +//! Project version number for ParseLiveQuery_tvOS. +FOUNDATION_EXPORT double ParseLiveQuery_tvOSVersionNumber; + +//! Project version string for ParseLiveQuery_tvOS. +FOUNDATION_EXPORT const unsigned char ParseLiveQuery_tvOSVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/Sources/ParseLiveQuery-watchOS/Info.plist b/Sources/ParseLiveQuery-watchOS/Info.plist new file mode 100644 index 00000000..9bcb2444 --- /dev/null +++ b/Sources/ParseLiveQuery-watchOS/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/Sources/ParseLiveQuery-watchOS/ParseLiveQuery_watchOS.h b/Sources/ParseLiveQuery-watchOS/ParseLiveQuery_watchOS.h new file mode 100644 index 00000000..47b493a8 --- /dev/null +++ b/Sources/ParseLiveQuery-watchOS/ParseLiveQuery_watchOS.h @@ -0,0 +1,19 @@ +// +// ParseLiveQuery_watchOS.h +// ParseLiveQuery-watchOS +// +// Created by Corey Baker on 11/15/20. +// Copyright © 2020 Parse. All rights reserved. +// + +#import + +//! Project version number for ParseLiveQuery_watchOS. +FOUNDATION_EXPORT double ParseLiveQuery_watchOSVersionNumber; + +//! Project version string for ParseLiveQuery_watchOS. +FOUNDATION_EXPORT const unsigned char ParseLiveQuery_watchOSVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index c1144a01..c90499fe 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -20,6 +20,16 @@ 4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; }; 4A819D9D1D937866009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; 4A819D9E1D93786A009C0F61 /* ObjCCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */; }; + 708836762561F503005B32F0 /* ParseLiveQuery_watchOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 708836742561F503005B32F0 /* ParseLiveQuery_watchOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 708836982561F55B005B32F0 /* ParseLiveQuery_tvOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 708836962561F55B005B32F0 /* ParseLiveQuery_tvOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 708836A02561F58F005B32F0 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; }; + 708836A12561F58F005B32F0 /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 708836A32561F5A6005B32F0 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; }; + 708836A42561F5A6005B32F0 /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 708836CE2561F791005B32F0 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE323200FB23E007CA404 /* Parse.framework */; }; + 708836CF2561F791005B32F0 /* Parse.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE323200FB23E007CA404 /* Parse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 708836D02561F79F005B32F0 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE327200FB23E007CA404 /* Parse.framework */; }; + 708836D12561F79F005B32F0 /* Parse.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE327200FB23E007CA404 /* Parse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; F534A5B21BDAFE0200CBD11A /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B11BDAFE0200CBD11A /* Subscription.swift */; }; F534A5B41BDB09CE00CBD11A /* Operation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B31BDB09CE00CBD11A /* Operation.swift */; }; F54D58B81C8E3446009F8D6C /* ClientPrivate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B71C8E3446009F8D6C /* ClientPrivate.swift */; }; @@ -277,6 +287,33 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 708836A22561F58F005B32F0 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 708836CF2561F791005B32F0 /* Parse.framework in Embed Frameworks */, + 708836A12561F58F005B32F0 /* Starscream.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + 708836A52561F5A6005B32F0 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 708836D12561F79F005B32F0 /* Parse.framework in Embed Frameworks */, + 708836A42561F5A6005B32F0 /* Starscream.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Parse+LiveQuery.swift"; sourceTree = ""; }; 094AE8FF1E25AF3100F408BC /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; }; @@ -288,6 +325,12 @@ 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 = ""; }; + 708836722561F502005B32F0 /* ParseLiveQuery_watchOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseLiveQuery_watchOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 708836742561F503005B32F0 /* ParseLiveQuery_watchOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseLiveQuery_watchOS.h; sourceTree = ""; }; + 708836752561F503005B32F0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 708836942561F55B005B32F0 /* ParseLiveQuery_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseLiveQuery_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 708836962561F55B005B32F0 /* ParseLiveQuery_tvOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseLiveQuery_tvOS.h; sourceTree = ""; }; + 708836972561F55B005B32F0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 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 = ""; }; @@ -303,6 +346,24 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 7088366F2561F502005B32F0 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 708836D02561F79F005B32F0 /* Parse.framework in Frameworks */, + 708836A32561F5A6005B32F0 /* Starscream.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 708836912561F55B005B32F0 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 708836CE2561F791005B32F0 /* Parse.framework in Frameworks */, + 708836A02561F58F005B32F0 /* Starscream.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; F5903CE61BD999C500C3EFFE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -386,6 +447,24 @@ name = Products; sourceTree = ""; }; + 708836732561F503005B32F0 /* ParseLiveQuery-watchOS */ = { + isa = PBXGroup; + children = ( + 708836742561F503005B32F0 /* ParseLiveQuery_watchOS.h */, + 708836752561F503005B32F0 /* Info.plist */, + ); + path = "ParseLiveQuery-watchOS"; + sourceTree = ""; + }; + 708836952561F55B005B32F0 /* ParseLiveQuery-tvOS */ = { + isa = PBXGroup; + children = ( + 708836962561F55B005B32F0 /* ParseLiveQuery_tvOS.h */, + 708836972561F55B005B32F0 /* Info.plist */, + ); + path = "ParseLiveQuery-tvOS"; + sourceTree = ""; + }; 81464FC51CA31DA0000235E7 /* Resources */ = { isa = PBXGroup; children = ( @@ -412,6 +491,8 @@ isa = PBXGroup; children = ( F5256FD01BD71F9A0052FB8A /* ParseLiveQuery */, + 708836732561F503005B32F0 /* ParseLiveQuery-watchOS */, + 708836952561F55B005B32F0 /* ParseLiveQuery-tvOS */, F5256FCF1BD71F9A0052FB8A /* Products */, BC2D6789239131E500DC849E /* BoltsSwift.xcodeproj */, 4A6AE337200FB569007CA404 /* Bolts.xcodeproj */, @@ -428,6 +509,8 @@ children = ( F5903CEA1BD999C500C3EFFE /* ParseLiveQuery.framework */, F5A9BFCA1BE0248D00E78326 /* ParseLiveQuery.framework */, + 708836722561F502005B32F0 /* ParseLiveQuery_watchOS.framework */, + 708836942561F55B005B32F0 /* ParseLiveQuery_tvOS.framework */, ); name = Products; sourceTree = ""; @@ -460,6 +543,22 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 7088366D2561F502005B32F0 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 708836762561F503005B32F0 /* ParseLiveQuery_watchOS.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 7088368F2561F55B005B32F0 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 708836982561F55B005B32F0 /* ParseLiveQuery_tvOS.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; F5903CE71BD999C500C3EFFE /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -477,6 +576,44 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 708836712561F502005B32F0 /* ParseLiveQuery-watchOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7088368B2561F503005B32F0 /* Build configuration list for PBXNativeTarget "ParseLiveQuery-watchOS" */; + buildPhases = ( + 7088366D2561F502005B32F0 /* Headers */, + 7088366E2561F502005B32F0 /* Sources */, + 7088366F2561F502005B32F0 /* Frameworks */, + 708836702561F502005B32F0 /* Resources */, + 708836A52561F5A6005B32F0 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "ParseLiveQuery-watchOS"; + productName = "ParseLiveQuery-watchOS"; + productReference = 708836722561F502005B32F0 /* ParseLiveQuery_watchOS.framework */; + productType = "com.apple.product-type.framework"; + }; + 708836932561F55B005B32F0 /* ParseLiveQuery-tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 708836992561F55B005B32F0 /* Build configuration list for PBXNativeTarget "ParseLiveQuery-tvOS" */; + buildPhases = ( + 7088368F2561F55B005B32F0 /* Headers */, + 708836902561F55B005B32F0 /* Sources */, + 708836912561F55B005B32F0 /* Frameworks */, + 708836922561F55B005B32F0 /* Resources */, + 708836A22561F58F005B32F0 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "ParseLiveQuery-tvOS"; + productName = "ParseLiveQuery-tvOS"; + productReference = 708836942561F55B005B32F0 /* ParseLiveQuery_tvOS.framework */; + productType = "com.apple.product-type.framework"; + }; F5903CE91BD999C500C3EFFE /* ParseLiveQuery-OSX */ = { isa = PBXNativeTarget; buildConfigurationList = F5903CEF1BD999C500C3EFFE /* Build configuration list for PBXNativeTarget "ParseLiveQuery-OSX" */; @@ -526,6 +663,14 @@ LastUpgradeCheck = 1120; ORGANIZATIONNAME = Parse; TargetAttributes = { + 708836712561F502005B32F0 = { + CreatedOnToolsVersion = 12.2; + ProvisioningStyle = Automatic; + }; + 708836932561F55B005B32F0 = { + CreatedOnToolsVersion = 12.2; + ProvisioningStyle = Automatic; + }; F5903CE91BD999C500C3EFFE = { CreatedOnToolsVersion = 7.1; LastSwiftMigration = 1100; @@ -568,6 +713,8 @@ targets = ( F5A9BFB61BE0248D00E78326 /* ParseLiveQuery-iOS */, F5903CE91BD999C500C3EFFE /* ParseLiveQuery-OSX */, + 708836712561F502005B32F0 /* ParseLiveQuery-watchOS */, + 708836932561F55B005B32F0 /* ParseLiveQuery-tvOS */, ); }; /* End PBXProject section */ @@ -786,6 +933,20 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ + 708836702561F502005B32F0 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 708836922561F55B005B32F0 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; F5903CE81BD999C500C3EFFE /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -803,6 +964,20 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 7088366E2561F502005B32F0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 708836902561F55B005B32F0 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; F5903CE51BD999C500C3EFFE /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -861,6 +1036,200 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 708836772561F503005B32F0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "ParseLiveQuery-watchOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.parse.livequery.watchos.ParseLiveQuery-watchOS"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 4; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 7.1; + }; + name = Debug; + }; + 708836782561F503005B32F0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "ParseLiveQuery-watchOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.parse.livequery.watchos.ParseLiveQuery-watchOS"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 4; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 7.1; + }; + name = Release; + }; + 7088369A2561F55B005B32F0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "ParseLiveQuery-tvOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.parse.livequery.tvos.ParseLiveQuery-tvOS"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 14.2; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 7088369B2561F55B005B32F0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + INFOPLIST_FILE = "ParseLiveQuery-tvOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.parse.livequery.tvos.ParseLiveQuery-tvOS"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 14.2; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; F5256FE01BD71F9A0052FB8A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1049,6 +1418,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 7088368B2561F503005B32F0 /* Build configuration list for PBXNativeTarget "ParseLiveQuery-watchOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 708836772561F503005B32F0 /* Debug */, + 708836782561F503005B32F0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 708836992561F55B005B32F0 /* Build configuration list for PBXNativeTarget "ParseLiveQuery-tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7088369A2561F55B005B32F0 /* Debug */, + 7088369B2561F55B005B32F0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; F5256FC81BD71F9A0052FB8A /* Build configuration list for PBXProject "ParseLiveQuery" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-tvOS.xcscheme b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-tvOS.xcscheme new file mode 100644 index 00000000..8c4e08c9 --- /dev/null +++ b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-tvOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-watchOS.xcscheme b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-watchOS.xcscheme new file mode 100644 index 00000000..25b3a19b --- /dev/null +++ b/Sources/ParseLiveQuery.xcodeproj/xcshareddata/xcschemes/ParseLiveQuery-watchOS.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1fed8e1e13fbf71b48d14704c895385896ce6429 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 19:10:30 -0500 Subject: [PATCH 17/25] add watchOS and tvOS to circle --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 57acb168..423b86ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,6 +97,8 @@ workflows: jobs: - ios - macos + - watchos + - tvos - demo - carthage: requires: From 9b09ef016d7d5cd55b9679ac9122d6a4edc2cffc Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 19:22:10 -0500 Subject: [PATCH 18/25] watchOS/tvOS devices on xcode 11 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 423b86ce..69372b85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,7 +54,7 @@ jobs: - restore_cache: *cache-pull - run: *prepare - save_cache: *cache-push - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-watchOS -configuration Debug -destination "platform=watchOS Simulator,name=Apple Watch Series 6 - 44mm" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-watchOS -configuration Debug -destination "platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm" 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 @@ -65,7 +65,7 @@ jobs: - restore_cache: *cache-pull - run: *prepare - save_cache: *cache-push - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-tvOS -configuration Debug -destination "platform=tvOS Simulator,name=Apple TV 4K" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-tvOS -configuration Debug -destination "platform=tvOS Simulator,name=Apple TV" 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 From 01f162e7d956f889baa438992de967a8c2a69008 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Sun, 15 Nov 2020 19:28:06 -0500 Subject: [PATCH 19/25] no need to specify destination --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69372b85..e4eb360b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,7 +54,7 @@ jobs: - restore_cache: *cache-pull - run: *prepare - save_cache: *cache-push - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-watchOS -configuration Debug -destination "platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-watchOS -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 @@ -65,7 +65,7 @@ jobs: - restore_cache: *cache-pull - run: *prepare - save_cache: *cache-push - - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-tvOS -configuration Debug -destination "platform=tvOS Simulator,name=Apple TV" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c; + - run: xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme ParseLiveQuery-tvOS -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 From d61bce380f7ce560c5c11c177130ee773efc06fe Mon Sep 17 00:00:00 2001 From: Corey Date: Sun, 15 Nov 2020 21:50:17 -0500 Subject: [PATCH 20/25] Starscream can't be higher Higher versions of Starscream will cause breaking change --- ParseLiveQuery.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 6a4ff042..e6e6c3e5 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -25,6 +25,6 @@ Pod::Spec.new do |s| s.dependency 'Parse', '~> 1.19.1' s.dependency 'Bolts-Swift', '~> 1.5.0' - s.dependency 'Starscream', '~> 3.1.0' + s.dependency 'Starscream', '3.1.0' end From 4fbd3ab1028cde3f97b968c35d1071e5d0e6126b Mon Sep 17 00:00:00 2001 From: Corey Date: Sun, 15 Nov 2020 23:43:56 -0500 Subject: [PATCH 21/25] Update ParseLiveQuery.podspec --- ParseLiveQuery.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index e6e6c3e5..36ca81e4 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse', '~> 1.19.1' + s.dependency 'Parse', '~> 1.19.0' s.dependency 'Bolts-Swift', '~> 1.5.0' s.dependency 'Starscream', '3.1.0' From 5d2f801c02c403408544cacc8e04032c649b6076 Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Mon, 16 Nov 2020 11:19:21 -0500 Subject: [PATCH 22/25] Update pod spec to match min between dependencies and reduce warnings --- ParseLiveQuery.podspec | 2 +- .../ParseLiveQuery.xcodeproj/project.pbxproj | 24 +++++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 36ca81e4..9fbd4cf3 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -18,7 +18,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '8.0' s.tvos.deployment_target = '10.0' s.watchos.deployment_target = '2.0' - s.osx.deployment_target = '10.12' + s.osx.deployment_target = '10.10' s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}' s.module_name = 'ParseLiveQuery' diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index c90499fe..060266a3 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -26,10 +26,6 @@ 708836A12561F58F005B32F0 /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 708836A32561F5A6005B32F0 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; }; 708836A42561F5A6005B32F0 /* Starscream.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 708836CE2561F791005B32F0 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE323200FB23E007CA404 /* Parse.framework */; }; - 708836CF2561F791005B32F0 /* Parse.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE323200FB23E007CA404 /* Parse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 708836D02561F79F005B32F0 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE327200FB23E007CA404 /* Parse.framework */; }; - 708836D12561F79F005B32F0 /* Parse.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE327200FB23E007CA404 /* Parse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; F534A5B21BDAFE0200CBD11A /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B11BDAFE0200CBD11A /* Subscription.swift */; }; F534A5B41BDB09CE00CBD11A /* Operation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F534A5B31BDB09CE00CBD11A /* Operation.swift */; }; F54D58B81C8E3446009F8D6C /* ClientPrivate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54D58B71C8E3446009F8D6C /* ClientPrivate.swift */; }; @@ -294,7 +290,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 708836CF2561F791005B32F0 /* Parse.framework in Embed Frameworks */, 708836A12561F58F005B32F0 /* Starscream.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -306,7 +301,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 708836D12561F79F005B32F0 /* Parse.framework in Embed Frameworks */, 708836A42561F5A6005B32F0 /* Starscream.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -350,7 +344,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 708836D02561F79F005B32F0 /* Parse.framework in Frameworks */, 708836A32561F5A6005B32F0 /* Starscream.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -359,7 +352,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 708836CE2561F791005B32F0 /* Parse.framework in Frameworks */, 708836A02561F58F005B32F0 /* Starscream.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1039,7 +1031,7 @@ 708836772561F503005B32F0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; + APPLICATION_EXTENSION_API_ONLY = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1084,14 +1076,14 @@ TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 7.1; + WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Debug; }; 708836782561F503005B32F0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; + APPLICATION_EXTENSION_API_ONLY = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1130,7 +1122,7 @@ VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 7.1; + WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Release; }; @@ -1179,7 +1171,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 14.2; + TVOS_DEPLOYMENT_TARGET = 10.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1223,7 +1215,7 @@ SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 14.2; + TVOS_DEPLOYMENT_TARGET = 10.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1321,7 +1313,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.12; + MACOSX_DEPLOYMENT_TARGET = 10.10; MARKETING_VERSION = 2.7.3; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; @@ -1348,7 +1340,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.12; + MACOSX_DEPLOYMENT_TARGET = 10.10; MARKETING_VERSION = 2.7.3; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.osx; PRODUCT_NAME = ParseLiveQuery; From 2e655103c969fc65e360b5240e86bdebcf4c4042 Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 11:52:48 -0500 Subject: [PATCH 23/25] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53ecc630..8b4d66cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...master) +### 2.7.3 + +[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...2.7.3) + +- Add watchOS and tvOS support [Corey Baker](https://github.com/cbaker6) +- Add caching to CI for faster builds [Corey Baker](https://github.com/cbaker6) +- Update project and podspecs with respect to dependencies [Corey Baker](https://github.com/cbaker6) +- Update jazzy docs to newer version [Corey Baker](https://github.com/cbaker6) + ### 2.7.2 [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.1...2.7.2) From e458ecbc58b8a5b4e4d07ce395a32bda021c9b3a Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 12:09:29 -0500 Subject: [PATCH 24/25] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b4d66cd..a4bfdb6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,11 @@ [Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...2.7.3) -- Add watchOS and tvOS support [Corey Baker](https://github.com/cbaker6) -- Add caching to CI for faster builds [Corey Baker](https://github.com/cbaker6) -- Update project and podspecs with respect to dependencies [Corey Baker](https://github.com/cbaker6) -- Update jazzy docs to newer version [Corey Baker](https://github.com/cbaker6) +- Add watchOS and tvOS support ([#235](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/235)), thanks to [Corey Baker](https://github.com/cbaker6) +- Add caching to CI for faster builds ([#235](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/235)), thanks to [Corey Baker](https://github.com/cbaker6) +- Update project and podspecs with respect to dependencies ([#235](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/235)), thanks to [Corey Baker](https://github.com/cbaker6) +- Update jazzy docs to newer version ([#235](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/235)), thanks to [Corey Baker](https://github.com/cbaker6) +- Minimum support due to dependencies (iOS 8, macOS 10.10, tvOS 10, watchOS 2.0) ([#235](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/235)), thanks to [Corey Baker](https://github.com/cbaker6) ### 2.7.2 From f4cef4d688f535ba61386616230974fe17158d90 Mon Sep 17 00:00:00 2001 From: Corey Date: Mon, 16 Nov 2020 13:31:13 -0500 Subject: [PATCH 25/25] Update CHANGELOG.md Co-authored-by: Tom Fox <13188249+TomWFox@users.noreply.github.com> --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4bfdb6a..791ee72d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### Master -[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...master) +[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.3...master) ### 2.7.3 @@ -107,4 +107,3 @@ - Fix: Deduplicates subscription requests, thanks to [Nathan Kellert](https://github.com/noobs2ninjas). - New: Support for wss, thanks to [@kajensen](https://github.com/kajensen). - Fix: Properly deliver events back to obj-c, thanks to [Richard Ross](https://github.com/richardjrossiii). -