Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@sideeffffect
Copy link
Member

Please merge as Merge, not as Squash-merge

sideeffffect and others added 7 commits July 1, 2022 11:58
* Scala Native: compile and package as JS and JVM

* -Xmx5G

* -Xmx6G

* -Xss8M

* -Xmx8G

* -Xmx5G

* revert
* Build all projects for Scala Native

* fix

* Magnolia isn't for Scala Native

* fix

* No Native Refined because depends on Magnolia

* refined 0.9.27
* Backport DeriveDiff fix from zio#6743

* Update test example to show diff in recursive structure

* Fix compilation

* empty commit

Co-authored-by: Kit Langton <[email protected]>
* CI: split compile step by Scala version

* CI: split compile step by Scala version

* CI: split compile step by Scala version

* CI: split compile step by Scala version

* CI: split compile step by Scala version

* Update ci.yml

* CI: split compile step by Scala version

* Use only binary versions for compile job

* change the names to 2.11 (with the dot)

* ci.yaml: manual selection of Scala version root project :(

* fix

* fix

* fix

* Run tests as rootJVM<version>/test

* Run tests as rootJVM<version>/test

* Run tests as rootJVM<version>/test

* Don't run testJunitRunnerTests test on Scala 3

* Split publishLocal

* Split publishLocal

* Split publishLocal

* Split publishLocal

* Split publishLocal

* Split publishLocal

* simplify roots

* Update build.sbt

* Update build.properties
# Conflicts:
#	.github/workflows/ci.yml
#	build.sbt
#	test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveDiffSpec.scala
#	test/shared/src/main/scala/zio/test/environment/package.scala
@sideeffffect sideeffffect force-pushed the merge-1.x-to-2.x-july branch from 5e307af to 4b3bc1b Compare July 20, 2022 02:30
@sideeffffect sideeffffect force-pushed the merge-1.x-to-2.x-july branch from 4b3bc1b to 182c994 Compare July 20, 2022 02:44
@sideeffffect sideeffffect reopened this Jul 20, 2022
@sideeffffect sideeffffect force-pushed the merge-1.x-to-2.x-july branch from 35f3ce6 to e5882c3 Compare July 20, 2022 03:55
@sideeffffect sideeffffect reopened this Jul 20, 2022
@sideeffffect
Copy link
Member Author

We're green 🎉
Can we merge this please? @adamgfraser @mijicd
👉 Please merge as Merge, not as Squash merge 👈

@adamgfraser adamgfraser merged commit be891e4 into zio:series/2.x Jul 20, 2022
@sideeffffect sideeffffect deleted the merge-1.x-to-2.x-july branch July 20, 2022 13:15
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.

3 participants