Skip to content
This repository has been archived by the owner on Jun 13, 2023. It is now read-only.

Updating Dependencies #226

Merged
merged 6 commits into from
Apr 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.6.3
ruby-2.6
25 changes: 13 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Parse-SDK-iOS-OSX
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Starscream
Submodule Starscream updated 54 files
+93 −2 .gitignore
+0 −1 .swift-version
+7 −0 .travis.yml
+22 −7 CHANGELOG.md
+4 −0 Gemfile
+212 −0 Gemfile.lock
+16 −0 Package.resolved
+11 −7 Package.swift
+34 −1 README.md
+1 −1 Sources/Info.plist
+1 −1 Sources/Starscream/Compression.swift
+92 −0 Sources/Starscream/SSLClientCertificate.swift
+5 −5 Sources/Starscream/SSLSecurity.swift
+67 −53 Sources/Starscream/WebSocket.swift
+3 −8 Starscream.podspec
+39 −81 Starscream.xcodeproj/project.pbxproj
+3 −5 Starscream.xcodeproj/xcshareddata/xcschemes/Starscream.xcscheme
+3 −1 Tests/CompressionTests.swift
+6 −0 build.sh
+1 −1 examples/SimpleTest/ws-server.rb
+11 −0 examples/WebSocketsOrgEcho/Podfile
+16 −0 examples/WebSocketsOrgEcho/Podfile.lock
+24 −0 examples/WebSocketsOrgEcho/Pods/Local Podspecs/Starscream.podspec.json
+16 −0 examples/WebSocketsOrgEcho/Pods/Manifest.lock
+26 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho-Info.plist
+182 −0 ...tsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho-acknowledgements.markdown
+5 −0 ...cketsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho-acknowledgements.plist
+5 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho-dummy.m
+158 −0 ...les/WebSocketsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho-frameworks.sh
+16 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho-umbrella.h
+11 −0 ...es/WebSocketsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho.debug.xcconfig
+6 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho.modulemap
+11 −0 .../WebSocketsOrgEcho/Pods/Target Support Files/Pods-WebSocketsOrgEcho/Pods-WebSocketsOrgEcho.release.xcconfig
+26 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Starscream/Starscream-Info.plist
+5 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Starscream/Starscream-dummy.m
+12 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Starscream/Starscream-prefix.pch
+16 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Starscream/Starscream-umbrella.h
+6 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Starscream/Starscream.modulemap
+9 −0 examples/WebSocketsOrgEcho/Pods/Target Support Files/Starscream/Starscream.xcconfig
+10 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho.xcworkspace/contents.xcworkspacedata
+8 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+21 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho/AppDelegate.swift
+98 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho/Assets.xcassets/AppIcon.appiconset/Contents.json
+6 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho/Assets.xcassets/Contents.json
+25 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho/Base.lproj/LaunchScreen.storyboard
+40 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho/Base.lproj/Main.storyboard
+45 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho/Info.plist
+19 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho/URL+Extensions.swift
+42 −0 examples/WebSocketsOrgEcho/WebSocketsOrgEcho/ViewController.swift
+28 −0 fastlane/Fastfile
+29 −0 fastlane/README.md
+4 −0 release.sh
+0 −2 zlib/include.h
+0 −9 zlib/module.modulemap
2 changes: 1 addition & 1 deletion Carthage/Checkouts/facebook-objc-sdk
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -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'
45 changes: 26 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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
6 changes: 3 additions & 3 deletions ParseLiveQuery.podspec
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
8 changes: 4 additions & 4 deletions Sources/ParseLiveQuery.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions publish.sh

This file was deleted.