Release 2.7.1 & bump dependencies (#226)

noobs2ninjas · web-flow · commit fa2081457555 · 2020-04-21T18:38:38.000+01:00
* Updating Dependencies

- Updating starscream to 3.1.1 for Swift 5 compatibility
- Parse 1.18.1 which includes Bolts 1.9.1 that adds catalyst compatibility and fixes App Store UIWebView deprication requirements.

* Updating podspec and project versions.

- Updated podspec to use specifically 3.1.0 Starscream to eliminate possibility of errors  upon cocoapod build.
- Updated podspec to version 2.7.1
- Updated Project to 2.7.1

* Updating Travis and Circle configs for next release.

- Updated travis to 11.2
- Updated cocoapod gem to 1.8.4
- Moved publish script to travis file as it was only 1 line

* Updating changelog

* Updating travis file to not try and run jazzy every PR.

* remove unnecessary install of bundler
diff --git 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 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:
           path: build/reports
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.6.3
+ruby-2.6
diff --git a/.travis.yml b/.travis.yml
@@ -1,35 +1,36 @@
+language: objective-c
+os: osx
+osx_image: xcode11.2
 branches:
   only:
     - master
     - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/
-language: objective-c
-os: osx
-osx_image: xcode11
 cache:
   - cocoapods
-install:  
-  - gem install bundler
+  
+install:
   - bundle install
 
 jobs:
   include:
-    - stage: distribution
+    - stage: release
       env: CocoaPods
-      script: EXPANDED_CODE_SIGN_IDENTITY="-" EXPANDED_CODE_SIGN_IDENTITY_NAME="-" bundle exec pod lib lint --allow-warnings
+      script: bundle exec pod lib lint --allow-warnings
       deploy:
         provider: script
-        skip_cleanup: true
-        script: ./publish.sh
+        cleanup: false
+        script: bundle exec pod trunk push ParseLiveQuery.podspec --allow-warnings
         on:
           tags: true
           all_branches: true
-    - stage: distribution
+    - stage: release
       env: Docs
       script: bundle exec jazzy
       deploy:
         provider: pages
-        skip_cleanup: true
+        cleanup: false
         github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
         local_dir: docs/
         on:
-          all_branches: true
+          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.0...master)
+[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.1...master)
+
+### 2.7.1
+
+[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.7.0...2.7.1)
+
+- Bump Parse SDK to v1.18.0
+([#226](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/226)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas)
+
+- Remove Bolts-ObjC as dependency
+([#223](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/223)), thanks to [Joe Szymanski](https://github.com/JoeSzymanski)
 
 ### 2.7.0
 
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
-github "BoltsFramework/Bolts-Swift" == 1.5.0
-github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.17.3
-github "daltoniam/Starscream" == 3.0.5
+github "BoltsFramework/Bolts-Swift" >= 1.5.0
+github "ParsePlatform/Parse-SDK-iOS-OSX" >= 1.18.0
+github "daltoniam/Starscream" == 3.1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "BoltsFramework/Bolts-ObjC" "1.9.0"
+github "BoltsFramework/Bolts-ObjC" "1.9.1"
 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"
+github "ParsePlatform/Parse-SDK-iOS-OSX" "1.18.0"
+github "daltoniam/Starscream" "3.1.1"
+github "facebook/facebook-objc-sdk" "v5.15.1"
diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC
@@ -1 +1 @@
-Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8
+Subproject commit 74b67b3b8be76a570cdbe193771927971f26e304
diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX
@@ -1 +1 @@
-Subproject commit 4439781088ac62e9524fd0167b83490571625fb7
+Subproject commit 09815dc16c7119336603d7a854d7ace36d5c4099
diff --git a/Carthage/Checkouts/Starscream b/Carthage/Checkouts/Starscream
@@ -1 +1 @@
-Subproject commit 114e5df9b6251970a069e8f1c0cbb5802759f0a9
+Subproject commit e6b65c6d9077ea48b4a7bdda8994a1d3c6969c8d
diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk
@@ -1 +1 @@
-Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2
+Subproject commit 9398d30089c2c14e0f0026e24388ca0829f8f1c5
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '~> 1.7.5'
 gem 'jazzy', '~> 0.11.1'
 gem 'xcpretty'
+gem 'cocoapods', '~> 1.8.4'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,24 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.1)
+    CFPropertyList (3.0.2)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.7.5)
+    cocoapods (1.8.4)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.5)
+      cocoapods-core (= 1.8.4)
       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.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
@@ -27,31 +30,34 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.10.0, < 2.0)
-    cocoapods-core (1.7.5)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.4)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.2.2)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.4.0)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     escape (0.0.4)
-    ffi (1.11.3)
+    ffi (1.12.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.11.1)
+    jazzy (0.11.2)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4
@@ -60,26 +66,27 @@ GEM
       sassc (~> 2.1)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
+    json (2.3.0)
     liferaft (0.0.6)
-    minitest (5.11.3)
+    minitest (5.14.0)
     molinillo (0.6.6)
-    mustache (1.1.0)
+    mustache (1.1.1)
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
     open4 (1.3.4)
     redcarpet (3.5.0)
     rouge (2.0.7)
     ruby-macho (1.4.0)
-    sassc (2.2.0)
+    sassc (2.3.0)
       ffi (~> 1.9)
-    sqlite3 (1.4.1)
+    sqlite3 (1.4.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.12.0)
+    xcodeproj (1.16.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -92,9 +99,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.7.5)
+  cocoapods (~> 1.8.4)
   jazzy (~> 0.11.1)
   xcpretty
 
 BUNDLED WITH
-   1.17.3
+   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.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'
@@ -22,8 +22,8 @@ Pod::Spec.new do |s|
   s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}'
   s.module_name = 'ParseLiveQuery'
 
-  s.dependency 'Parse', '~> 1.17.3'
+  s.dependency 'Parse', '~> 1.18.0'
   s.dependency 'Bolts-Swift', '~> 1.5.0'
-  s.dependency 'Starscream', '~> 3.1.0'
+  s.dependency 'Starscream', '3.1.0'
 
 end
diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj
@@ -1006,14 +1006,14 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 2.7.0;
+				MARKETING_VERSION = 2.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios;
 				PRODUCT_NAME = ParseLiveQuery;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_INSTALL_OBJC_HEADER = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1035,13 +1035,13 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 2.7.0;
+				MARKETING_VERSION = 2.7.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios;
 				PRODUCT_NAME = ParseLiveQuery;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_INSTALL_OBJC_HEADER = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
diff --git a/publish.sh b/publish.sh
