From 8f70ab5eeb71b81acdb5489023b4ce39b1e2c841 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 17 Apr 2020 17:35:33 -0500 Subject: [PATCH 1/6] 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. --- Cartfile | 6 +++--- Cartfile.resolved | 8 ++++---- Carthage/Checkouts/Bolts-ObjC | 2 +- Carthage/Checkouts/Parse-SDK-iOS-OSX | 2 +- Carthage/Checkouts/Starscream | 2 +- Carthage/Checkouts/facebook-objc-sdk | 2 +- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cartfile b/Cartfile index babc0d34..59a29b3e 100644 --- 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 \ No newline at end of file +github "BoltsFramework/Bolts-Swift" >= 1.5.0 +github "ParsePlatform/Parse-SDK-iOS-OSX" >= 1.18.0 +github "daltoniam/Starscream" == 3.1.1 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 48e6a5c0..347b3e5f 100644 --- 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 index 4dc65427..74b67b3b 160000 --- 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 index 44397810..09815dc1 160000 --- 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 index 114e5df9..e6b65c6d 160000 --- 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 index cf9e0d83..9398d300 160000 --- a/Carthage/Checkouts/facebook-objc-sdk +++ b/Carthage/Checkouts/facebook-objc-sdk @@ -1 +1 @@ -Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 +Subproject commit 9398d30089c2c14e0f0026e24388ca0829f8f1c5 diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index ae2be416..96dc87fc 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -1013,7 +1013,7 @@ 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; @@ -1041,7 +1041,7 @@ 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; From b8e7b3ccc24ab57d1e852ea6ec15779b9cafac84 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Fri, 17 Apr 2020 17:42:51 -0500 Subject: [PATCH 2/6] 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 --- ParseLiveQuery.podspec | 6 +++--- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index a356dce2..39660c4a 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' @@ -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 \ No newline at end of file diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 96dc87fc..2070a9cb 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -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.0; + MARKETING_VERSION = 2.7.1; 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.0; + MARKETING_VERSION = 2.7.1; PRODUCT_BUNDLE_IDENTIFIER = com.parse.livequery.ios; PRODUCT_NAME = ParseLiveQuery; SDKROOT = iphoneos; From 5d212f355494598e29fe0d11675a47183622b3a4 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Sun, 19 Apr 2020 23:50:04 -0500 Subject: [PATCH 3/6] 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 --- .circleci/config.yml | 2 +- .travis.yml | 10 +++++----- Gemfile | 2 +- Gemfile.lock | 45 +++++++++++++++++++++++++------------------- publish.sh | 4 ---- 5 files changed, 33 insertions(+), 30 deletions(-) delete mode 100755 publish.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 787cc179..0a33bbff 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 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/.travis.yml b/.travis.yml index 4728db33..08f17b7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ branches: - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ language: objective-c os: osx -osx_image: xcode11 +osx_image: xcode11.2 cache: - cocoapods install: @@ -18,8 +18,8 @@ jobs: script: EXPANDED_CODE_SIGN_IDENTITY="-" EXPANDED_CODE_SIGN_IDENTITY_NAME="-" 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 @@ -28,8 +28,8 @@ jobs: 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 \ No newline at end of file + all_branches: true diff --git a/Gemfile b/Gemfile index 68785475..ff15c32e 100644 --- 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 index 4bf2ba85..084058a9 100644 --- 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,10 +66,11 @@ 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) @@ -71,15 +78,15 @@ GEM 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/publish.sh b/publish.sh deleted file mode 100755 index 3eaf6d4e..00000000 --- a/publish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e -gem install bundler -bundle install -EXPANDED_CODE_SIGN_IDENTITY="-" EXPANDED_CODE_SIGN_IDENTITY_NAME="-" bundle exec pod trunk push ParseLiveQuery.podspec --allow-warnings From 2ef1679338f37d4dda766f03822621b54052c447 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Mon, 20 Apr 2020 00:00:44 -0500 Subject: [PATCH 4/6] Updating changelog --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27d6208e..227417ca 100644 --- 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 From 3ba6ceaa0c4979804fdf8cc8b1e85d01b07de9de Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Mon, 20 Apr 2020 00:16:19 -0500 Subject: [PATCH 5/6] Updating travis file to not try and run jazzy every PR. --- .ruby-version | 2 +- .travis.yml | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4560fb91..7872401a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.6.3 +ruby-2.6 diff --git a/.travis.yml b/.travis.yml index 08f17b7f..a080f078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ +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.2 cache: - cocoapods install: @@ -13,9 +13,9 @@ 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 cleanup: false @@ -23,7 +23,7 @@ jobs: on: tags: true all_branches: true - - stage: distribution + - stage: release env: Docs script: bundle exec jazzy deploy: @@ -32,4 +32,5 @@ jobs: github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard local_dir: docs/ on: + tags: true all_branches: true From 649b90685d412de3806572e9e431423def6b166a Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Mon, 20 Apr 2020 00:25:53 -0500 Subject: [PATCH 6/6] remove unnecessary install of bundler --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a080f078..6d4b3e42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ branches: - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ cache: - cocoapods -install: - - gem install bundler + +install: - bundle install jobs: