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

fix maptype doesn't use the frameless injection properly #421

Merged
merged 1 commit into from
Jan 28, 2025

Conversation

ukby1234
Copy link
Contributor

also fix test forking and add jvm flags to run tests in jdk17.

@ukby1234
Copy link
Contributor Author

cc @thesamet

@thesamet
Copy link
Contributor

Can you rebase so the change is tested in CI? Also are the changes in build.sbt necessary for this PR?

@ukby1234 ukby1234 force-pushed the fix-map-type-injection branch from 7ca5802 to f5c0165 Compare January 15, 2025 06:14
@ukby1234
Copy link
Contributor Author

Can you rebase so the change is tested in CI? Also are the changes in build.sbt necessary for this PR?

Just rebased. No they are not necessary but I only have jdk 17 installed.

@ukby1234
Copy link
Contributor Author

@thesamet friendly bump

build.sbt Outdated
@@ -105,7 +105,25 @@ lazy val `sparksql-scalapb` = (projectMatrix in file("sparksql-scalapb"))
scalapbPlugin(scalapb.value.scalapbVersion) -> (Test / sourceManaged).value
),
Test / run / fork := true,
Test / javaOptions ++= Seq("-Xmx2G")
Test / fork := true,
Copy link
Contributor

Choose a reason for hiding this comment

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

Can this be moved and explored on a different PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@thesamet friendly bump

@ukby1234 ukby1234 force-pushed the fix-map-type-injection branch from f5c0165 to 3e9715b Compare January 23, 2025 19:08
@thesamet thesamet merged commit 6d5549c into scalapb:master Jan 28, 2025
3 checks passed
@thesamet
Copy link
Contributor

Thanks for fixing this!

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