Merge pull request #1723 from scala-steward-org/topic/move-into-vcs

Move bitbucket{,server}, github, gitlab packages into vcs
scala-steward-org · Nov 8, 2020 · 538d8ab · 538d8ab
2 parents 7a0d73f + 03a682c
commit 538d8ab
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 34 deletions.
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
@@ -19,12 +19,12 @@ package org.scalasteward.core.vcs
 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, MonadThrow}
+import org.scalasteward.core.vcs.bitbucket.http4s.Http4sBitbucketApiAlg
+import org.scalasteward.core.vcs.bitbucketserver.http4s.Http4sBitbucketServerApiAlg
 import org.scalasteward.core.vcs.data.AuthenticatedUser
+import org.scalasteward.core.vcs.github.http4s.Http4sGitHubApiAlg
+import org.scalasteward.core.vcs.gitlab.http4s.Http4sGitLabApiAlg
 
 final class VCSSelection[F[_]](implicit
     client: HttpJsonClient[F],
@@ -33,13 +33,13 @@ final class VCSSelection[F[_]](implicit
     F: MonadThrow[F]
 ) {
   private def github(config: Config): Http4sGitHubApiAlg[F] = {
-    import org.scalasteward.core.github.http4s.authentication.addCredentials
+    import org.scalasteward.core.vcs.github.http4s.authentication.addCredentials
 
     new Http4sGitHubApiAlg[F](config.vcsApiHost, _ => addCredentials(user))
   }
 
   private def gitlab(config: Config): Http4sGitLabApiAlg[F] = {
-    import org.scalasteward.core.gitlab.http4s.authentication.addCredentials
+    import org.scalasteward.core.vcs.gitlab.http4s.authentication.addCredentials
     new Http4sGitLabApiAlg[F](
       config.vcsApiHost,
       user,
@@ -50,13 +50,13 @@ final class VCSSelection[F[_]](implicit
   }
 
   private def bitbucket(config: Config): Http4sBitbucketApiAlg[F] = {
-    import org.scalasteward.core.bitbucket.http4s.authentication.addCredentials
+    import org.scalasteward.core.vcs.bitbucket.http4s.authentication.addCredentials
 
     new Http4sBitbucketApiAlg(config.vcsApiHost, user, _ => addCredentials(user), config.doNotFork)
   }
 
   private def bitbucketServer(config: Config): Http4sBitbucketServerApiAlg[F] = {
-    import org.scalasteward.core.bitbucket.http4s.authentication.addCredentials
+    import org.scalasteward.core.vcs.bitbucket.http4s.authentication.addCredentials
 
     new Http4sBitbucketServerApiAlg[F](
       config.vcsApiHost,

diff --git a/...org/scalasteward/core/bitbucket/Url.scala → ...scalasteward/core/vcs/bitbucket/Url.scala b/...org/scalasteward/core/bitbucket/Url.scala → ...scalasteward/core/vcs/bitbucket/Url.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket
+package org.scalasteward.core.vcs.bitbucket
 
 import org.http4s.Uri
 import org.scalasteward.core.git.Branch

diff --git a/...ket/http4s/CreatePullRequestRequest.scala → ...ket/http4s/CreatePullRequestRequest.scala b/...ket/http4s/CreatePullRequestRequest.scala → ...ket/http4s/CreatePullRequestRequest.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import io.circe.{Encoder, Json}
 import org.scalasteward.core.git.Branch

diff --git a/...bucket/http4s/Http4sBitbucketApiAlg.scala → ...bucket/http4s/Http4sBitbucketApiAlg.scala b/...bucket/http4s/Http4sBitbucketApiAlg.scala → ...bucket/http4s/Http4sBitbucketApiAlg.scala
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 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, MonadThrow, UnexpectedResponse}
 import org.scalasteward.core.vcs.VCSApiAlg
+import org.scalasteward.core.vcs.bitbucket.Url
+import org.scalasteward.core.vcs.bitbucket.http4s.json._
 import org.scalasteward.core.vcs.data._
 
 class Http4sBitbucketApiAlg[F[_]](

diff --git a/...asteward/core/bitbucket/http4s/Page.scala → ...ward/core/vcs/bitbucket/http4s/Page.scala b/...asteward/core/bitbucket/http4s/Page.scala → ...ward/core/vcs/bitbucket/http4s/Page.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import io.circe.Decoder
 

diff --git a/...bitbucket/http4s/RepositoryResponse.scala → ...bitbucket/http4s/RepositoryResponse.scala b/...bitbucket/http4s/RepositoryResponse.scala → ...bitbucket/http4s/RepositoryResponse.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import cats.syntax.all._
 import io.circe.{ACursor, Decoder, DecodingFailure, Json}

diff --git a/...d/core/github/http4s/authentication.scala → ...vcs/bitbucket/http4s/authentication.scala b/...d/core/github/http4s/authentication.scala → ...vcs/bitbucket/http4s/authentication.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.github.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import cats.Applicative
 import cats.syntax.all._

diff --git a/...asteward/core/bitbucket/http4s/json.scala → ...ward/core/vcs/bitbucket/http4s/json.scala b/...asteward/core/bitbucket/http4s/json.scala → ...ward/core/vcs/bitbucket/http4s/json.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import io.circe.Decoder
 import org.http4s.Uri

diff --git a/.../http4s/Http4sBitbucketServerApiAlg.scala → .../http4s/Http4sBitbucketServerApiAlg.scala b/.../http4s/Http4sBitbucketServerApiAlg.scala → .../http4s/Http4sBitbucketServerApiAlg.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucketserver.http4s
+package org.scalasteward.core.vcs.bitbucketserver.http4s
 
 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, MonadThrow}
 import org.scalasteward.core.vcs.VCSApiAlg
+import org.scalasteward.core.vcs.bitbucketserver.http4s.Json.{Reviewer, User}
 import org.scalasteward.core.vcs.data.PullRequestState.Open
 import org.scalasteward.core.vcs.data._
 

diff --git a/...rd/core/bitbucketserver/http4s/Json.scala → ...ore/vcs/bitbucketserver/http4s/Json.scala b/...rd/core/bitbucketserver/http4s/Json.scala → ...ore/vcs/bitbucketserver/http4s/Json.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucketserver.http4s
+package org.scalasteward.core.vcs.bitbucketserver.http4s
 
 import cats.data.NonEmptyList
 import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}

diff --git a/...la/org/scalasteward/core/github/Url.scala → ...rg/scalasteward/core/vcs/github/Url.scala b/...la/org/scalasteward/core/github/Url.scala → ...rg/scalasteward/core/vcs/github/Url.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.github
+package org.scalasteward.core.vcs.github
 
 import org.http4s.Uri
 import org.scalasteward.core.git.Branch

diff --git a/...re/github/http4s/Http4sGitHubApiAlg.scala → ...cs/github/http4s/Http4sGitHubApiAlg.scala b/...re/github/http4s/Http4sGitHubApiAlg.scala → ...cs/github/http4s/Http4sGitHubApiAlg.scala
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.github.http4s
+package org.scalasteward.core.vcs.github.http4s
 
 import org.http4s.{Request, Uri}
 import org.scalasteward.core.git.Branch
-import org.scalasteward.core.github._
 import org.scalasteward.core.util.HttpJsonClient
 import org.scalasteward.core.vcs.VCSApiAlg
 import org.scalasteward.core.vcs.data._
+import org.scalasteward.core.vcs.github._
 
 final class Http4sGitHubApiAlg[F[_]](
     gitHubApiHost: Uri,

diff --git a/...ore/bitbucket/http4s/authentication.scala → ...re/vcs/github/http4s/authentication.scala b/...ore/bitbucket/http4s/authentication.scala → ...re/vcs/github/http4s/authentication.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.github.http4s
 
 import cats.Applicative
 import cats.syntax.all._

diff --git a/...la/org/scalasteward/core/gitlab/Url.scala → ...rg/scalasteward/core/vcs/gitlab/Url.scala b/...la/org/scalasteward/core/gitlab/Url.scala → ...rg/scalasteward/core/vcs/gitlab/Url.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.gitlab
+package org.scalasteward.core.vcs.gitlab
 
 import org.http4s.Uri
 import org.scalasteward.core.git.Branch

diff --git a/...re/gitlab/http4s/Http4sGitlabApiAlg.scala → ...cs/gitlab/http4s/Http4sGitlabApiAlg.scala b/...re/gitlab/http4s/Http4sGitlabApiAlg.scala → ...cs/gitlab/http4s/Http4sGitlabApiAlg.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.gitlab.http4s
+package org.scalasteward.core.vcs.gitlab.http4s
 
 import cats.syntax.all._
 import io.chrisdavenport.log4cats.Logger
@@ -23,11 +23,11 @@ import io.circe.generic.semiauto._
 import io.circe.syntax._
 import org.http4s.{Request, Status, Uri}
 import org.scalasteward.core.git.{Branch, Sha1}
-import org.scalasteward.core.gitlab._
 import org.scalasteward.core.util.uri.uriDecoder
 import org.scalasteward.core.util.{HttpJsonClient, MonadThrow, UnexpectedResponse}
 import org.scalasteward.core.vcs.VCSApiAlg
 import org.scalasteward.core.vcs.data._
+import org.scalasteward.core.vcs.gitlab._
 
 final private[http4s] case class ForkPayload(id: String, namespace: String)
 final private[http4s] case class MergeRequestPayload(

diff --git a/...d/core/gitlab/http4s/authentication.scala → ...re/vcs/gitlab/http4s/authentication.scala b/...d/core/gitlab/http4s/authentication.scala → ...re/vcs/gitlab/http4s/authentication.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.scalasteward.core.gitlab.http4s
+package org.scalasteward.core.vcs.gitlab.http4s
 
 import cats.Applicative
 import cats.syntax.all._

diff --git a/...et/http4s/Http4sBitbucketApiAlgTest.scala → ...et/http4s/Http4sBitbucketApiAlgTest.scala b/...et/http4s/Http4sBitbucketApiAlgTest.scala → ...et/http4s/Http4sBitbucketApiAlgTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import cats.effect.IO
 import io.circe.literal._

diff --git a/...core/bitbucket/http4s/JsonCodecTest.scala → .../vcs/bitbucket/http4s/JsonCodecTest.scala b/...core/bitbucket/http4s/JsonCodecTest.scala → .../vcs/bitbucket/http4s/JsonCodecTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.bitbucket.http4s
+package org.scalasteward.core.vcs.bitbucket.http4s
 
 import io.circe.Json
 import org.scalasteward.core.vcs.data.PullRequestState

diff --git a/...rg/scalasteward/core/github/UrlTest.scala → ...calasteward/core/vcs/github/UrlTest.scala b/...rg/scalasteward/core/github/UrlTest.scala → ...calasteward/core/vcs/github/UrlTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.github
+package org.scalasteward.core.vcs.github
 
 import org.http4s.syntax.literals._
 import org.scalasteward.core.git.Branch

diff --git a/...ithub/http4s/Http4sGitHubApiAlgTest.scala → ...ithub/http4s/Http4sGitHubApiAlgTest.scala b/...ithub/http4s/Http4sGitHubApiAlgTest.scala → ...ithub/http4s/Http4sGitHubApiAlgTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.github.http4s
+package org.scalasteward.core.vcs.github.http4s
 
 import cats.effect.IO
 import io.circe.literal._

diff --git a/...re/github/http4s/authenticationTest.scala → ...cs/github/http4s/authenticationTest.scala b/...re/github/http4s/authenticationTest.scala → ...cs/github/http4s/authenticationTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.github.http4s
+package org.scalasteward.core.vcs.github.http4s
 
 import cats.Id
 import org.http4s.headers.{Accept, Authorization}

diff --git a/...itlab/http4s/Http4sGitlabApiAlgTest.scala → ...itlab/http4s/Http4sGitlabApiAlgTest.scala b/...itlab/http4s/Http4sGitlabApiAlgTest.scala → ...itlab/http4s/Http4sGitlabApiAlgTest.scala
@@ -1,4 +1,4 @@
-package org.scalasteward.core.gitlab.http4s
+package org.scalasteward.core.vcs.gitlab.http4s
 
 import cats.effect.IO
 import io.circe.literal._