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

dep: bump sbt to 1.7.1 #15728

Merged
merged 16 commits into from
Jul 28, 2022
Merged

dep: bump sbt to 1.7.1 #15728

merged 16 commits into from
Jul 28, 2022

Conversation

ckipp01
Copy link
Member

@ckipp01 ckipp01 commented Jul 22, 2022

Looking at the
commit
that added 1.6.2 I believe I have everything updated that needs to be. I
am updating this because it's needed for a test that I'm adding in #15565,
but thought it'd be best to do this bump in a separate pr.

@ckipp01 ckipp01 force-pushed the sbtBump branch 3 times, most recently from 262769f to 70da34a Compare July 22, 2022 17:28
@ckipp01 ckipp01 marked this pull request as draft July 23, 2022 19:27
Looking at the
[commit](scala@fa063b6)
that added 1.6.2 I believe I have everything updated that needs to be. I
am updating this because it's needed for a test that I'm adding in scala#15565,
but thought it'd be best to do this bump in a separate pr.
This is needed due to some scalablytyped stuff that changed in
fs2. Without it, you'll get an error when updating the sbt 1.7.x
that scalably typed doesn't support 1.7.x
This also allows us to get rid of the fnGen stuff and simplify
the sbtTestCommand and sbtPublishCommand
If not you'll have issues with http4s tests since http4s
isn't using the 1.x version of munit yet
We currently have a mess of different versions and because of it
cats-effect is using something deprecated in cats. However we can't
bump everything due to other issues, so for a temporary fix try
turning off xfatal for htpp4s.
@griggt
Copy link
Collaborator

griggt commented Jul 27, 2022

scalatestplus-scalacheck seems to be stuck in an infinite loop while running its test suite.

I think this might be fixed by backing up scalacheck a bit to 0ac8005753ab98b6494fd631502201b97a103638 (the commit with the v1.16.0 tag). This worked for me locally, hopefully that doesn't break anything else...

Without doing this it was getting stuck in CI
@ckipp01
Copy link
Member Author

ckipp01 commented Jul 27, 2022

Whoa, what a ride, that was way more involved than I thought it'd be. To give a little recap of why I did this since I ended up making way more changes than originally planned. While working on #15565 which relates to #14904 I needed to bump the sbt version so that our sbt testing would take into account the newer zinc that is included in sbt 1.7.x. So I opened this assuming it'd be a quick bump. Once opened, the fork of fs2 we were using wouldn't work with 1.7.x because of scalablyTyped. In newer version of fs2 that direct dependency was removed in order to make maintenance easier. However, once I bumped fs2 that opened a can of works as you could see. There were also some issues scala8-java-compat and a couple other small things in various places. I originally thought I could just bump everything to the latest, but obviously that didn't work, especially because of version mismatches. For example munit head is really the 1.x milestone series which some in here are using (like cats), but not others. So some things are locked on certain versions.

I also noticed while doing this that the majority of the forks are crazy out of date. And some had changes in them that weren't upstreamed. I did a couple prs to upstream some stuff but I'll probably do a couple more in the future and try to sync this all better. I'll start a discussion around this because the current process for the community build is quite difficult and might benefit from being more up to date. Story for another time.

I think this might be fixed by backing up scalacheck a bit to 0ac8005753ab98b6494fd631502201b97a103638 (the commit with the v1.16.0 tag). This worked for me locally, hopefully that doesn't break anything else...

Thank you so much for this. I was just about to start bumping other things in an attempt to fix this, but this was way easier.

@ckipp01 ckipp01 marked this pull request as ready for review July 27, 2022 07:27
@griggt
Copy link
Collaborator

griggt commented Jul 28, 2022

I think this might be fixed by backing up scalacheck a bit to 0ac8005753ab98b6494fd631502201b97a103638 (the commit with the v1.16.0 tag). This worked for me locally, hopefully that doesn't break anything else...

Thank you so much for this. I was just about to start bumping other things in an attempt to fix this, but this was way easier.

I had tried bumping scalatest and scalatestplus-scalacheck but it did not improve the situation (still hung). It seems like the most recent PR merged to scalacheck may be the cause; I opened typelevel/scalacheck#909.

@ckipp01 ckipp01 deleted the sbtBump branch July 28, 2022 06:46
dwijnand pushed a commit to dwijnand/scala3 that referenced this pull request Aug 1, 2022
* dep: update fs2 submodule

This is needed due to some scalablytyped stuff that changed in
fs2. Without it, you'll get an error when updating the sbt 1.7.x
that scalably typed doesn't support 1.7.x

* dep: sync with latest staging http4s

* dep: sync with latest scala-java8-compat

This also allows us to get rid of the fnGen stuff and simplify
the sbtTestCommand and sbtPublishCommand

* dep: sync with latest cats in staging

* dep: sync with latest munit-cats-effect

* dep: sync with latest discipline and discipline-munit

* dep: lock munit at 0.7.29

If not you'll have issues with http4s tests since http4s
isn't using the 1.x version of munit yet

* disable `tlFatalWarnings` in http4s

* dep: lock scalacheck at 1.16.0

Without doing this it was getting stuck in CI
bishabosha pushed a commit to dotty-staging/dotty that referenced this pull request Oct 18, 2022
* dep: update fs2 submodule

This is needed due to some scalablytyped stuff that changed in
fs2. Without it, you'll get an error when updating the sbt 1.7.x
that scalably typed doesn't support 1.7.x

* dep: sync with latest staging http4s

* dep: sync with latest scala-java8-compat

This also allows us to get rid of the fnGen stuff and simplify
the sbtTestCommand and sbtPublishCommand

* dep: sync with latest cats in staging

* dep: sync with latest munit-cats-effect

* dep: sync with latest discipline and discipline-munit

* dep: lock munit at 0.7.29

If not you'll have issues with http4s tests since http4s
isn't using the 1.x version of munit yet

* disable `tlFatalWarnings` in http4s

* dep: lock scalacheck at 1.16.0

Without doing this it was getting stuck in CI
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

2 participants