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

Update sockets #236

Merged
merged 20 commits into from
Nov 17, 2020
Merged

Update sockets #236

merged 20 commits into from
Nov 17, 2020

Conversation

cbaker6
Copy link
Contributor

@cbaker6 cbaker6 commented Nov 15, 2020 •
edited
Loading

This should be merged after #235

Should this be 2.8.0? The starscream dependency had a major API change. The updates here weren't too difficult, but will need to see what happens on actual systems. I tested in one of my apps that uses simple liveQueries and works with no issues

@cbaker6 cbaker6 marked this pull request as draft November 15, 2020 19:48
@cbaker6 cbaker6 marked this pull request as ready for review November 15, 2020 21:26
@cbaker6 cbaker6 requested review from drdaz and a team November 15, 2020 22:51
drdaz
drdaz approved these changes Nov 16, 2020
View reviewed changes
Copy link
Member

@drdaz drdaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cbaker6
Copy link
Contributor Author

cbaker6 commented Nov 16, 2020

@TomWFox and @drdaz do you agree that this one should be 2.8.0 and the previous PR 2.7.3?

Technically, I can combine them both for 2.8.0, but since this PR has a bigger dependency change, 2.7.3 would give users the option of having the new features with the old socket dependency

@drdaz
Copy link
Member

drdaz commented Nov 16, 2020

Splitting the changes into two releases would be exceptionally polite to our consumers actually. I like it.

@TomWFox
Copy link
Contributor

TomWFox commented Nov 16, 2020

Sounds good to me.

TomWFox
TomWFox previously requested changes Nov 16, 2020
View reviewed changes
Copy link
Contributor

@TomWFox TomWFox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version the podspec needs updating too.

cbaker6 and others added 8 commits November 16, 2020 13:41
@cbaker6 @TomWFox
Update CHANGELOG.md
938f37d 
Co-authored-by: Tom Fox <13188249+TomWFox@users.noreply.github.com>
@cbaker6
Update versions to 2.8.0, add watchOS and tvOS to circle build
37cb5d5
@cbaker6
Merge branch 'master'
80e446a 
Conflicts:
	.circleci/config.yml
	CHANGELOG.md
	Cartfile
	Cartfile.resolved
	ParseLiveQuery.podspec
	Sources/ParseLiveQuery.xcodeproj/project.pbxproj
@cbaker6
Update version numbers of watchOS and tvOS
ee5f944
@cbaker6
Show warnings from pod trunk push
fe0b9c2
@cbaker6
fix cart files
d8859f2
@cbaker6
Merge branch 'sockets' of https://github.com/cbaker6/ParseLiveQuery-i…
ac53c62 
…OS-OSX into sockets
@cbaker6
remove dups from merge
11f1efc
@cbaker6 cbaker6 merged commit 9619104 into parse-community:master Nov 17, 2020
@cbaker6 cbaker6 deleted the sockets branch November 17, 2020 00:01
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@drdaz drdaz drdaz approved these changes

@TomWFox TomWFox TomWFox left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Please update Starscream dependency up to '~> 3.1.1' how it was before in your v2.7.0 release.
3 participants
@cbaker6 @drdaz @TomWFox