Change artifact organization and root package to org.typelevel #384

bpholt · 2021-10-06T03:42:16Z

Fixes #341 and #380.

We still need someone to generate a gpg keypair and update the GitHub Secrets for the repository. (I'm happy to do this, but I would need to be made an admin to do so.)

bpholt · 2021-10-06T03:43:44Z

util/src/main/scala/org/typelevel/catbird/util/asyncstream.scala

  final def asyncStreamEq[A](atMost: Duration)(implicit A: Eq[A]): Eq[AsyncStream[A]] = new Eq[AsyncStream[A]] {
    final def eqv(x: AsyncStream[A], y: AsyncStream[A]): scala.Boolean = Await.result(
-      x.take(1).toSeq().join(y.take(1).toSeq()).map { case (x, y) => x == y },
+      x.head.join(y.head).map((Eq[Option[A]].eqv _).tupled),


I made this change because with the additional compiler warnings, the compiler was complaining that the implicit A: Eq[A] was unused. This is a 2.12/2.13 cross-compatible way to check equality using the Eq[A] instance.

bpholt · 2021-10-06T03:44:30Z

effect/src/test/scala/org/typelevel/catbird/util/effect/RerunnableContextShiftSuite.scala

    assert(poolName1 == f.futurePoolName)
    assert(poolName2 == f.ioPoolName)
    assert(poolName2 == f.ioPoolName)
+    assert(poolName3 == f.futurePoolName)


poolName3 was previously unused. I'm not 100% sure if this is the right test, but it passes.

codecov-commenter · 2021-10-06T03:44:46Z

Codecov Report

Merging #384 (eb53c40) into master (e5c27b3) will increase coverage by 0.08%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #384      +/-   ##
==========================================
+ Coverage   91.12%   91.21%   +0.08%     
==========================================
  Files          17       18       +1     
  Lines         293      296       +3     
  Branches        1        2       +1     
==========================================
+ Hits          267      270       +3     
  Misses         26       26

Impacted Files	Coverage Δ
...elevel/catbird/benchmark/RerunnableBenchmark.scala	`100.00% <ø> (ø)`
...ypelevel/catbird/util/effect/FutureInstances.scala	`100.00% <ø> (ø)`
...ypelevel/catbird/util/effect/RerunnableClock.scala	`100.00% <ø> (ø)`
...l/catbird/util/effect/RerunnableContextShift.scala	`81.81% <ø> (ø)`
...evel/catbird/util/effect/RerunnableInstances.scala	`100.00% <ø> (ø)`
...ypelevel/catbird/util/effect/RerunnableTimer.scala	`66.66% <ø> (ø)`
.../scala/org/typelevel/catbird/finagle/service.scala	`100.00% <ø> (ø)`
.../scala/org/typelevel/catbird/util/Rerunnable.scala	`90.24% <ø> (ø)`
...main/scala/org/typelevel/catbird/util/future.scala	`95.34% <ø> (ø)`
...org/typelevel/catbird/util/internal/Newtype1.scala	`100.00% <ø> (ø)`
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e5c27b3...eb53c40. Read the comment docs.

bpholt · 2021-10-06T03:45:53Z

effect/src/main/scala/org/typelevel/catbird/util/effect/package.scala

      case Throw(err) => k(Left[Throwable, A](err))
    }
+
+    ()


Explicitly return () to indicate that we're ok discarding the Future returned by fa.respond

bpholt · 2021-10-06T03:46:48Z

effect3/src/main/scala/org/typelevel/catbird/util/effect/FutureInstances.scala

      final override def forceR[A, B](fa: Future[A])(fb: Future[B]): Future[B] =
        fa.liftToTry.flatMap { resultA =>
-          resultA.handle(Monitor.catcher)
+          resultA.handle[Any](Monitor.catcher)


Any was the inferred type, but with sbt-tpolecat, an inferred Any ends up as an error because it is often incorrect.

bpholt · 2021-10-06T04:47:44Z

I think we should probably also add a Scala Steward artifact migration and Scalafix rewrite rule to reduce the impact on users.

felixbr · 2021-10-06T10:11:25Z

Nice work 👍

edit: I'm waiting for Travis to merge this, mainly because he has the publishing rights and probably needs to handle the gpg stuff.

felixbr · 2021-10-06T10:15:43Z

Just one small thing: The CI pipeline currently only runs for 2.12.x and 2.13.x. If it's easy to do, it would be nice to run the effect3 module with 3.0 so regressions there are also caught in PRs.

bpholt · 2021-10-06T17:22:21Z

Right now, I'm not sure sbt-github-actions supports builds where the Scala versions vary in different submodules. When I've needed to do that in the past, I've had to remove the plugin and commit manually-maintained GitHub Actions workflow files.

Cite to sbt-github-actions

Any and all settings which affect the behavior of the generative plugin should be set in the ThisBuild scope (for example, ThisBuild / crossScalaVersions := rather than just crossScalaVersions := ). This is important because GitHub Actions workflows are global across the entire build, regardless of how individual projects are configured. A corollary of this is that it is not possible (yet) to have specific subprojects which build with different Scala versions, Java versions, or OSes.

That said, I tried setting it up so that util and effect3 cross-compiled with Scala 3, and ran into issues with the way twitter-util publishes its Scala 3 artifacts:

[error] Modules were resolved with conflicting cross-version suffixes in ProjectRef(uri("file:…/catbird/"), "util"):
[error]    org.scala-lang.modules:scala-collection-compat _3, _2.13
[error] stack trace is suppressed; run last util / update for the full output
[error] (util / update) Conflicting cross-version suffixes in: org.scala-lang.modules:scala-collection-compat
[error] Total time: 1 s, completed Oct 6, 2021 12:11:53 PM

It looks like util-core_3 depends on util-functions_2.13, which is probably wrong? (The util-core build is set up with some customizations for Scala 3 whereas the util-function build is not.)

I also noticed that the kind-projector λ syntax is still in place for some of the sources that would be cross-compiled, which I don't think will work for Scala 3 either, so even if the dependency stuff is resolved, this repo doesn't look like it's quite ready to run Scala 3 builds in CI yet?

Maybe I should commit the Scala 3 attempts I've made so far and push them up in a separate draft PR, that could potentially be incorporated into #371.

felixbr · 2021-10-07T08:30:16Z

Ok, that looks like way too much work and if twitter/util is not published correctly for Scala 3, there isn't much we can do here.

Don't worry about it 🙂

bpholt · 2021-10-28T22:50:04Z

@travisbrown FYI, just wanted to make sure you saw this PR 🙂

bpholt · 2021-11-17T17:05:55Z

In light of Travis moving away from Scala OSS, it seems we need to identify someone to take over the publishing and GPG key management for this project. @felixbr are you the right person for that? My thought is to identify at least one person and then work with Travis for them to take over.

(edit: as I mentioned above, I'm happy to do take the reins too, if folks are comfortable with me being added as a maintainer.)

bpholt · 2021-12-12T23:15:07Z

@felixbr friendly bump on my question above 🙂

felixbr · 2022-01-31T10:38:14Z

Much like Travis I'm extremely disappointed in the Scala leadership (Odersky but also others) and last year I decided to no longer do any open-source work for Scala unless it's directly needed by my company.

Life is too short to provide free labor for terrible people.

Personally I'd be happy if you would take over this project as a maintainer since you already made some good improvements and it's bad that your contributions are blocked by my decision.
The project is under typelevel now, so a semi-automated release process will hopefully also help to distribute work between more shoulders.

armanbilge · 2022-01-31T17:38:43Z

@bpholt I'd be happy to help move the build onto sbt-typelevel.

We still need someone to generate a gpg keypair and update the GitHub Secrets for the repository. (I'm happy to do this, but I would need to be made an admin to do so.)

We're in the process of installing org-wide secrets for these.

bpholt · 2022-02-01T23:34:48Z

We're planning to migrate this repo to sbt-typelevel, but it seems cleaner to do so in a separate PR. I'm going to merge this but we'll hold off on releasing anything until that switch has been made.

bpholt added 3 commits October 5, 2021 17:24

change package name to org.typelevel.catbird

108dd71

convert to sbt-ci-release

82e2f66

use sbt-tpolecat to set compiler options

6a18efa

bpholt commented Oct 6, 2021

View reviewed changes

bpholt added 2 commits October 6, 2021 00:52

add Scalafix rule to rename io.catbird to org.typelevel.catbird

7992250

update README

67cbf3d

bpholt force-pushed the ci-release branch from 9aa0ee7 to 67cbf3d Compare October 6, 2021 05:53

felixbr self-requested a review October 6, 2021 10:12

felixbr approved these changes Oct 6, 2021

View reviewed changes

Merge branch 'master' into ci-release

eb53c40

bpholt merged commit d005337 into typelevel:master Feb 1, 2022

bpholt deleted the ci-release branch February 1, 2022 23:35

bpholt changed the title ~~Use sbt-ci-release~~ Change artifact organization and root package to org.typelevel Jun 1, 2022

bpholt mentioned this pull request Jun 1, 2022

Migrate catbird artifacts to org.typelevel scala-steward-org/scala-steward#2615

Merged

Uh oh!

Change artifact organization and root package to org.typelevel #384

Change artifact organization and root package to org.typelevel #384

Uh oh!

Conversation

bpholt commented Oct 6, 2021

Uh oh!

bpholt Oct 6, 2021

Choose a reason for hiding this comment

Uh oh!

bpholt Oct 6, 2021

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Oct 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bpholt Oct 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bpholt Oct 6, 2021

Choose a reason for hiding this comment

Uh oh!

bpholt commented Oct 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

felixbr commented Oct 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

felixbr commented Oct 6, 2021

Uh oh!

bpholt commented Oct 6, 2021

Uh oh!

felixbr commented Oct 7, 2021

Uh oh!

bpholt commented Oct 28, 2021

Uh oh!

bpholt commented Nov 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bpholt commented Dec 12, 2021

Uh oh!

felixbr commented Jan 31, 2022

Uh oh!

armanbilge commented Jan 31, 2022

Uh oh!

bpholt commented Feb 1, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov-commenter commented Oct 6, 2021 •

edited

Loading

bpholt Oct 6, 2021 •

edited

Loading

bpholt commented Oct 6, 2021 •

edited

Loading

felixbr commented Oct 6, 2021 •

edited

Loading

bpholt commented Nov 17, 2021 •

edited

Loading