Merge pull request #1720 from scala-steward-org/topic/no-sync-in-vcss…

…election Replace Sync with MonadThrow in VCSSelection and *ApiAlg
scala-steward-org · Nov 6, 2020 · 2b37338 · 2b37338
2 parents b39f66e + 01710fe
commit 2b37338
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/...es/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlg.scala b/...es/core/src/main/scala/org/scalasteward/core/bitbucket/http4s/Http4sBitbucketApiAlg.scala
@@ -16,22 +16,21 @@
 
 package org.scalasteward.core.bitbucket.http4s
 
-import cats.effect.Sync
 import cats.syntax.all._
 import org.http4s.{Request, Status, Uri}
 import org.scalasteward.core.bitbucket.Url
 import org.scalasteward.core.bitbucket.http4s.json._
 import org.scalasteward.core.git.Branch
-import org.scalasteward.core.util.{HttpJsonClient, UnexpectedResponse}
+import org.scalasteward.core.util.{HttpJsonClient, MonadThrow, UnexpectedResponse}
 import org.scalasteward.core.vcs.VCSApiAlg
 import org.scalasteward.core.vcs.data._
 
-class Http4sBitbucketApiAlg[F[_]: Sync](
+class Http4sBitbucketApiAlg[F[_]](
     bitbucketApiHost: Uri,
     user: AuthenticatedUser,
     modify: Repo => Request[F] => F[Request[F]],
     doNotFork: Boolean
-)(implicit client: HttpJsonClient[F])
+)(implicit client: HttpJsonClient[F], F: MonadThrow[F])
     extends VCSApiAlg[F] {
   private val url = new Url(bitbucketApiHost)
 

diff --git a/...main/scala/org/scalasteward/core/bitbucketserver/http4s/Http4sBitbucketServerApiAlg.scala b/...main/scala/org/scalasteward/core/bitbucketserver/http4s/Http4sBitbucketServerApiAlg.scala
@@ -16,12 +16,11 @@
 
 package org.scalasteward.core.bitbucketserver.http4s
 
-import cats.effect.Sync
 import cats.syntax.all._
 import org.http4s.{Request, Uri}
 import org.scalasteward.core.bitbucketserver.http4s.Json.{Reviewer, User}
 import org.scalasteward.core.git.Branch
-import org.scalasteward.core.util.HttpJsonClient
+import org.scalasteward.core.util.{HttpJsonClient, MonadThrow}
 import org.scalasteward.core.vcs.VCSApiAlg
 import org.scalasteward.core.vcs.data.PullRequestState.Open
 import org.scalasteward.core.vcs.data._
@@ -32,7 +31,7 @@ class Http4sBitbucketServerApiAlg[F[_]](
     bitbucketApiHost: Uri,
     modify: Repo => Request[F] => F[Request[F]],
     useReviewers: Boolean
-)(implicit client: HttpJsonClient[F], F: Sync[F])
+)(implicit client: HttpJsonClient[F], F: MonadThrow[F])
     extends VCSApiAlg[F] {
   val url = new StashUrls(bitbucketApiHost)
 

diff --git a/modules/core/src/main/scala/org/scalasteward/core/gitlab/http4s/Http4sGitlabApiAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/gitlab/http4s/Http4sGitlabApiAlg.scala
@@ -126,7 +126,7 @@ class Http4sGitLabApiAlg[F[_]](
 )(implicit
     client: HttpJsonClient[F],
     logger: Logger[F],
-    monad: MonadThrow[F]
+    F: MonadThrow[F]
 ) extends VCSApiAlg[F] {
   import GitlabJsonCodec._
 
@@ -164,9 +164,9 @@ class Http4sGitLabApiAlg[F[_]](
       client
         .get[MergeRequestOut](url.existingMergeRequest(repo, internalId), modify(repo))
         .flatMap {
-          case mr if (mr.mergeStatus =!= GitlabMergeStatus.Checking) => monad.pure(mr)
+          case mr if (mr.mergeStatus =!= GitlabMergeStatus.Checking) => F.pure(mr)
           case _ if (retries > 0)                                    => waitForMergeRequestStatus(internalId, retries - 1)
-          case other                                                 => monad.pure(other)
+          case other                                                 => F.pure(other)
         }
 
     val updatedMergeRequest =

diff --git a/modules/core/src/main/scala/org/scalasteward/core/vcs/VCSSelection.scala b/modules/core/src/main/scala/org/scalasteward/core/vcs/VCSSelection.scala
@@ -16,21 +16,21 @@
 
 package org.scalasteward.core.vcs
 
-import cats.effect.Sync
+import io.chrisdavenport.log4cats.Logger
 import org.scalasteward.core.application.Config
 import org.scalasteward.core.application.SupportedVCS.{Bitbucket, BitbucketServer, GitHub, Gitlab}
 import org.scalasteward.core.bitbucket.http4s.Http4sBitbucketApiAlg
 import org.scalasteward.core.bitbucketserver.http4s.Http4sBitbucketServerApiAlg
 import org.scalasteward.core.github.http4s.Http4sGitHubApiAlg
 import org.scalasteward.core.gitlab.http4s.Http4sGitLabApiAlg
-import org.scalasteward.core.util.HttpJsonClient
+import org.scalasteward.core.util.{HttpJsonClient, MonadThrow}
 import org.scalasteward.core.vcs.data.AuthenticatedUser
-import io.chrisdavenport.log4cats.Logger
 
-class VCSSelection[F[_]: Sync](implicit
+final class VCSSelection[F[_]](implicit
     client: HttpJsonClient[F],
     user: AuthenticatedUser,
-    logger: Logger[F]
+    logger: Logger[F],
+    F: MonadThrow[F]
 ) {
   private def github(config: Config): Http4sGitHubApiAlg[F] = {
     import org.scalasteward.core.github.http4s.authentication.addCredentials