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

Use recommended sort order for modifiers #740

Merged
merged 2 commits into from
Jul 10, 2020

Conversation

theigl
Copy link
Collaborator

@theigl theigl commented Jul 6, 2020

Addresses the second code style issue described in #739 by applying Java's recommended modifier order.

See https://stackoverflow.com/a/16732059/441266

@magro
Copy link
Collaborator

magro commented Jul 10, 2020

@theigl I like that! 🙂 Unfortunately there are now conflicts due to the previous PRs/merges... 😕

…rder

# Conflicts:
#	src/com/esotericsoftware/kryo/SerializerFactory.java
#	src/com/esotericsoftware/kryo/serializers/DefaultSerializers.java
#	src/com/esotericsoftware/kryo/serializers/OptionalSerializers.java
#	src/com/esotericsoftware/kryo/serializers/TimeSerializers.java
#	test/com/esotericsoftware/kryo/serializers/FieldSerializerTest.java
#	test/com/esotericsoftware/kryo/serializers/MapSerializerTest.java
@theigl
Copy link
Collaborator Author

theigl commented Jul 10, 2020

@magro: Thanks! I just resolved the conflicts.

@magro magro merged commit 5723ffe into EsotericSoftware:master Jul 10, 2020
@theigl theigl deleted the standard-modifier-order branch July 10, 2020 17:59
@magro
Copy link
Collaborator

magro commented Jul 11, 2020

@theigl after some issues with publishing I now managed to push RC7 - on its way to maven central...

@theigl
Copy link
Collaborator Author

theigl commented Jul 14, 2020

@magro: It seems the release didn't make it to Maven Central. 👀

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

Successfully merging this pull request may close these issues.

3 participants