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.

Sign up for GitHub

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

Jump to bottom

[ANCHOR-634] Bump Java SDK version to 0.43.0 #1289

Merged
merged 2 commits into from
Mar 12, 2024
Merged

[ANCHOR-634] Bump Java SDK version to 0.43.0 #1289

merged 2 commits into from
Mar 12, 2024

Conversation

philipliu
Copy link
Contributor

@philipliu philipliu commented Mar 11, 2024 •
edited
Loading

Description

This bumps the Java SDK version from 0.42.0 to 0.43.0. This is an attempt to resolve an issue with the payment observer getting stuck on unparsable payment operations.

Bumping the SDK version required bumping the Kotlin to 1.9 and ktfmt versions, which is why the lines changed are so large.

Context

19:54:54.694 ERROR - o.s.a.p.p.o.s.StellarPaymentObserver - stellar payment observer stream error:
com.google.gson.JsonSyntaxException: java.lang.IllegalStateException: Not a JSON Object: "problem"
at com.google.gson.Gson.fromJson(Gson.java:1238)
at com.google.gson.Gson.fromJson(Gson.java:1137)
at com.google.gson.Gson.fromJson(Gson.java:1047)
at com.google.gson.Gson.fromJson(Gson.java:982)
at org.stellar.sdk.requests.SSEStream$StellarEventSourceListener.onEvent(SSEStream.java:257)
at

Testing

  • ./gradlew test

Documentation

N/A

Known limitations

N/A

@philipliu philipliu marked this pull request as ready for review March 11, 2024 21:30
@philipliu philipliu marked this pull request as draft March 11, 2024 21:37
@philipliu philipliu changed the title Bump Java SDK version to 0.43.0 [ANCHOR-634] Bump Java SDK version to 0.43.0 Mar 12, 2024
@philipliu philipliu marked this pull request as ready for review March 12, 2024 00:18
lijamie98
lijamie98 approved these changes Mar 12, 2024
View reviewed changes
Copy link
Collaborator

@lijamie98 lijamie98 left a comment

Choose a reason for hiding this comment

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

Approved with some nits.

gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
Copy link
Collaborator

Choose a reason for hiding this comment

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

Are we bumping the gradle distribution as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I couldn't get the project to build without upgrading the Gradle version. If this fix works, I will do the same in the 2.x branch.

core/src/test/kotlin/org/stellar/anchor/TestHelper.kt
@@ -13,7 +13,7 @@ class TestHelper {
account: String = TEST_ACCOUNT,
accountMemo: String? = null,
hostUrl: String = "",
clientDomain: String = "vibrant.stellar.org"
clientDomain: String = "vibrant.stellar.org",
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: Why this extra ,?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ktfmt upgrade

core/src/test/kotlin/org/stellar/anchor/TestHelper.kt
@@ -22,7 +22,7 @@ class TestHelper {
issuedAt,
issuedAt + 60,
"",
clientDomain
clientDomain,
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: same as above

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ktfmt upgrade

core/src/test/kotlin/org/stellar/anchor/auth/AuthHelperTest.kt
@@ -40,7 +40,7 @@ class AuthHelperTest {
JwtToken.of(
"http://localhost:8080",
currentTimeMilliseconds / 1000L,
(currentTimeMilliseconds + JWT_EXPIRATION_MILLISECONDS) / 1000L
(currentTimeMilliseconds + JWT_EXPIRATION_MILLISECONDS) / 1000L,
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: same as above

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ktfmt upgrade

core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt
@@ -110,7 +110,7 @@ internal class Sep24ServiceTest {
assertEquals(slotTxn.captured.assetCode, "USDC")
assertEquals(
slotTxn.captured.assetIssuer,
"GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
"GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Looks like this is from formatter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, all the formatting changes are from upgrading ktfmt version. Upgrading the SDK version required pulling in Kotlin 1.9 which required upgrading Gradle and ktfmt.

gradle/libs.versions.toml
@@ -25,13 +25,13 @@ junit = "5.8.2"
junit-suite-engine = "1.8.2"
kafka = "3.1.0"
kafka-json-schema = "7.0.1"
kotlin = "1.6.20"
kotlin = "1.9.23"
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: Can we also document this in the PR description?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@philipliu philipliu merged commit c7d1276 into stellar:legacy/main-1.2 Mar 12, 2024
2 checks passed
@philipliu philipliu deleted the fix/anchor-634-observer branch March 12, 2024 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lijamie98 lijamie98 lijamie98 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@philipliu @lijamie98