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

Merge series/1.x to series/2.x #7853

Merged
merged 9 commits into from
Feb 22, 2023

Conversation

sideeffffect
Copy link
Member

@sideeffffect sideeffffect commented Feb 22, 2023

Please merge as Merge commit (not Squash commit) 🙏

charlescd and others added 7 commits November 23, 2022 11:45
* Update Scala.js and Scala Native to last supporting 2.11

* update Scala versions

* update Silencer versions

* lower Scala versions
# Conflicts:
#	.github/workflows/ci.yml
#	build.sbt
#	core-tests/shared/src/test/scala/zio/ScheduleSpec.scala
#	core/shared/src/main/scala/zio/Schedule.scala
@sideeffffect
Copy link
Member Author

@mijicd @adamgfraser Please merge as Merge commit (not Squash commit) 🙏

@sideeffffect
Copy link
Member Author

Good to be merged @adamgfraser @mijicd 🎉

// Once it's available, this should be merged together with the `js-jvm` variant back to `shared`.
// https://github.com/scala-native/scala-native/pull/3127
private[zio] trait UpdateRuntimeFlagsWithinPlatformSpecific {
type RuntimeFlagsFunc[A] = Int => A
Copy link
Member Author

Choose a reason for hiding this comment

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

btw, do we need to mark it as private[zio] too?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think if the trait is package private and the only object that extends it is package private there is no need for the members to be package private as well.

@adamgfraser adamgfraser merged commit eebc34e into zio:series/2.x Feb 22, 2023
@sideeffffect sideeffffect deleted the series/2.x-merge-1.x branch February 22, 2023 22:38
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.

None yet

5 participants