Merge master branch #4
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use a chained `if-else` statement instead of chained `let` calls to avoid using stack memory for really large `oneof` objects.
This PR adds a new optional boolean parameter `json_support` to disable generating json marshal/unmarshal functionality. It is by default true hence the runtime and sample projects are not affected. Fixes #54.
Fix protoc tasks to use a consistent version of the protoc binary
garyp
force-pushed
the
garyp/kotlin-native
branch
2 times, most recently
from
7e6a94e
to
ed99bc2
Compare
Originally based on cretz/pb-and-k#15. This is a rebase of #29 onto the latest version of master. Fixes #19.
garyp
force-pushed
the
garyp/kotlin-native
branch
from
ed99bc2
to
b95c4dc
Compare
|
I'm going to just do this via a new PR to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges the
masterbranch fromstreem/pbandkinto your PR, resolving all conflicts. I can't merge your PR in GitHub right now because it has a conflict with themasterbranch. I'm not sure if there's a better way to handle this in GitHub, but I think if you merge this PR into your branch, then GitHub will let me squash & merge your PR intostreem/pbandk.