Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set macOS deployment target to 10.10 to follow pospec #1444

Merged
merged 3 commits into from
Nov 9, 2017
Merged

Set macOS deployment target to 10.10 to follow pospec #1444

merged 3 commits into from
Nov 9, 2017

Conversation

lucas34
Copy link
Member

@lucas34 lucas34 commented Nov 6, 2017

Link to issue #1441
Solve macOS deployment target discrepancy when using Carthage or pod.

I updated for all target. Moya, MoyaTest, RxMoya and ReactiveMoya.

@codecov-io
Copy link

codecov-io commented Nov 6, 2017

Codecov Report

Merging #1444 into master will increase coverage by 5.48%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1444      +/-   ##
==========================================
+ Coverage   82.92%   88.41%   +5.48%     
==========================================
  Files           5        5              
  Lines         164      164              
==========================================
+ Hits          136      145       +9     
+ Misses         28       19       -9
Impacted Files Coverage Δ
Sources/RxMoya/Observable+Response.swift 70.58% <0%> (+8.82%) ⬆️
Sources/ReactiveMoya/SignalProducer+Response.swift 90.9% <0%> (+9.09%) ⬆️
Sources/RxMoya/Single+Response.swift 100% <0%> (+12.5%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e4eeb7e...54ffb0d. Read the comment docs.

Copy link
Member

@SD10 SD10 left a comment

Choose a reason for hiding this comment

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

LGTM. I'm just not sure if the podspec was meant to be upgraded to 10.11 or this downgraded

Copy link
Contributor

@BasThomas BasThomas left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks, @lucas34!

@BasThomas
Copy link
Contributor

BasThomas commented Nov 6, 2017

@SD10 according to #1441 (comment):

our podspec already uses 10.10, thus I believe that this is a bug that our Moya.xcodeproj uses 10.11 as a deployment target and it should be safe to fix.

Copy link
Member

@sunshinejr sunshinejr left a comment

Choose a reason for hiding this comment

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

Looks good, @lucas34, thanks for doing that - looks good! Can you also add a Changelog entry that we fixed Carthage macOS deployment target, from 10.11 to 10.10? 😉 It should be under Fixed column, which is already created in Changelog.md.

Copy link
Member

@AndrewSB AndrewSB left a comment

Choose a reason for hiding this comment

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

Can you remove your merge commit from this Pull Request please? Just the one with the change please

@lucas34
Copy link
Member Author

lucas34 commented Nov 7, 2017

Sure, I removed the merge commit

Copy link
Member

@pedrovereza pedrovereza left a comment

Choose a reason for hiding this comment

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

💯

Changelog.md Outdated
@@ -1,6 +1,7 @@
# Next
### Fixed
- Fixed a bug with missing Content-Type header when using `.requestJSONEncodable` [#1410](https://github.com/Moya/Moya/pull/1410) by [@Vict0rS](https://github.com/Vict0rS).
- Fixes carthage OS X not targeting 10.10 [#1444](https://github.com/Moya/Moya/pull/1444) by [@lucas34](https://github.com/lucas34).
Copy link
Member

Choose a reason for hiding this comment

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

This is minor, but can you change Fixes to Fixed, please? :)

@lucas34
Copy link
Member Author

lucas34 commented Nov 8, 2017

Looks like @BasThomas added the merge commit back. Is it ok ?

@AndrewSB
Copy link
Member

AndrewSB commented Nov 9, 2017

Yup, it looks great.

Oh interesting, the merge commits are from the GitHub CTA... I wonder if they show up in the history of master once we merged. I guess we're going to find out!

@AndrewSB AndrewSB merged commit 1bdcb5c into Moya:master Nov 9, 2017
@ashfurrow
Copy link
Member

Thanks a lot for contributing to Moya! I've invited you to join the Moya GitHub organization – no pressure to accept! If you'd like more information on what that means, check out our contributor guidelines and feel free to reach out with any questions.

@AndrewSB
Copy link
Member

AndrewSB commented Nov 9, 2017

Wow, that's incredibly annoying
messages image 254709031

Github adds them as clean merges, complete noise.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants