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

Remove the dependency on Guava. #534

Merged

Conversation

overcat
Copy link
Member

@overcat overcat commented Sep 19, 2023

# Conflicts:
#	src/main/java/org/stellar/sdk/Predicate.java
#	src/main/java/org/stellar/sdk/responses/PredicateDeserializer.java
# Conflicts:
#	src/main/java/org/stellar/sdk/responses/sorobanrpc/SimulateTransactionResponse.java
#	src/test/java/org/stellar/sdk/SorobanServerTest.java
@overcat
Copy link
Member Author

overcat commented Sep 19, 2023

Since #524 has already been approved, and this PR only fixes errors in resolving conflicts, I no longer need to wait for another approval. Let me merge it directly.

@overcat overcat merged commit 1f0e276 into lightsail-network:soroban Sep 19, 2023
5 of 7 checks passed
overcat added a commit that referenced this pull request Sep 19, 2023
Revert "Remove the dependency on Guava. (#524)" (#533)

This reverts commit 302aba5.

Remove the dependency on Guava. (#524)
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.

1 participant