Add watchOS and tvOS support (#235)

* add watchOS support to cocoapods * add cache to CI and bump version numbers * fix colon * fix circle cache * current circle builds don't need bundle, no need to waste time with it * add back bundle install * fix travis cache * fix travis cache * updates CI to 11.6 * remove OS req in circle build. Update gems * update travis * update jazzy script * update travis * latest working version of Jazzy. It won't build for jazzy >0.13.1 * revert travis * add watchOS and tvOS targets * add watchOS and tvOS to circle * watchOS/tvOS devices on xcode 11 * no need to specify destination * Starscream can't be higher Higher versions of Starscream will cause breaking change * Update ParseLiveQuery.podspec * Update pod spec to match min between dependencies and reduce warnings * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Tom Fox <[email protected]> Co-authored-by: Tom Fox <[email protected]>
parse-community · Nov 16, 2020 · db0458f · db0458f
1 parent 57d2b01
commit db0458f
Show file tree

Hide file tree

Showing 18 changed files with 732 additions and 71 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,12 +1,22 @@
 defaults: &defaults
     macos:
-      xcode: "11.2.1"
+      xcode: "11.6.0"
     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
       sudo gem install bundler
+      bundle config set path 'vendor/bundle'
       bundle install
   - &filter-only-master
     branches:
@@ -19,25 +29,53 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - restore_cache: *cache-pull
       - run: *prepare
-      - 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;
+      - save_cache: *cache-push
+      - 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
   macos:
     <<: *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:
           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 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 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:
       - 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 +86,23 @@ 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
+      - watchos
+      - tvos
       - demo
+      - carthage:
+          requires:
+            - ios
   nightly:
     jobs:
       - carthage

diff --git a/.jazzy.yaml b/.jazzy.yaml
diff --git a/.travis.yml b/.travis.yml
@@ -1,36 +1,41 @@
 language: objective-c
 os: osx
-osx_image: xcode11.2
+osx_image: xcode11.6
 branches:
   only:
     - master
     - /^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:
     - 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
     - stage: release
       env: Docs
-      script: bundle exec jazzy
+      script:
+        - ./jazzy.sh
       deploy:
         provider: pages
-        cleanup: false
-        github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
-        local_dir: docs/
+        skip_cleanup: true
+        github_token: $GITHUB_TOKEN
+        local_dir: ./docs/
         on:
           tags: true
           all_branches: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,17 @@
 
 ### 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
+
+[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.2...2.7.3)
+
+- 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
 
@@ -97,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).
-
diff --git 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
@@ -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
diff --git 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.1'
diff --git 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.1)
       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.1)
 
 BUNDLED WITH
    2.1.4
diff --git 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'
@@ -17,7 +17,8 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '10.0'
-  s.osx.deployment_target = '10.12'
+  s.watchos.deployment_target = '2.0'
+  s.osx.deployment_target = '10.10'
 
   s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}'
   s.module_name = 'ParseLiveQuery'

diff --git a/Sources/ParseLiveQuery-tvOS/Info.plist b/Sources/ParseLiveQuery-tvOS/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>