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

Update SwiftProtobuf to 1.3.1 #367

Merged
merged 3 commits into from
Feb 15, 2019
Merged

Conversation

rebello95
Copy link
Collaborator

@rebello95 rebello95 commented Feb 12, 2019

3 commits which are intended to merge separately:

  • Updated SwiftProtobuf dependencies across the repo to 1.3.1. This fixes several warnings with Xcode 10.2, and updates some other functionality as outlined here: https://github.com/apple/swift-protobuf/releases
  • Updated the Carthage project with SwiftProtobuf 1.3.1 using the make command
  • Updated generated code in Echo example project using the updated plugins, which seemed to be very outdated. This whole directory needs to be cleaned up and validated, which I'll likely do in a follow-up PR

Tests I did:

  • Built the Carthage project
  • Created a new project with CocoaPods using my branch, ran the updated generators on a test .proto file, added the outputted files to the project, and built it

@rebello95 rebello95 requested review from timburks and MrMage February 12, 2019 18:06
Copy link
Collaborator

@MrMage MrMage 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, but any idea why echo.grpc.swift has changed to public visibility while removing the test stubs and the server-side code? That might also explain the CI failures. (You could try running make test-plugin; cp /tmp/echo.grpc.swift Sources/Examples/Echo/Generated/echo.grpc.swift to rebuild that file.)

This fixes several warnings with Xcode 10.2.
@rebello95 rebello95 force-pushed the update-swiftprotobuf branch from 00bd6c8 to c35a409 Compare February 14, 2019 18:36
@rebello95
Copy link
Collaborator Author

Ah yea, good call @MrMage. Rebased + updated, let's see if CI passes now

Update the generated code that's checked in for this example.
Ran `make project-carthage` and built the project to ensure it works correctly.
@rebello95 rebello95 force-pushed the update-swiftprotobuf branch from c35a409 to e32d64a Compare February 14, 2019 18:39
@rebello95
Copy link
Collaborator Author

CI is green now

@MrMage MrMage merged commit 96bf49e into grpc:master Feb 15, 2019
@rebello95 rebello95 deleted the update-swiftprotobuf branch February 15, 2019 17:43
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.

2 participants