From 5b15d30f51996731e014786adb2b8a145dd364e0 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 17 Sep 2021 05:15:18 +0000 Subject: [PATCH 1/7] Update github4s to 0.30.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d10a562e..d35c7704 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ lazy val pluginSettings: Seq[Def.Setting[_]] = Seq( addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3"), addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1"), libraryDependencies ++= Seq( - "com.47deg" %% "github4s" % "0.28.5", + "com.47deg" %% "github4s" % "0.30.0", "org.http4s" %% "http4s-blaze-client" % "0.21.28", "net.jcazevedo" %% "moultingyaml" % "0.4.2", "com.lihaoyi" %% "scalatags" % "0.9.4", From 25cb198a5bbfd38c2ab8ba6f02cda7c1fc451a45 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 24 Sep 2021 05:12:11 +0000 Subject: [PATCH 2/7] Update github4s to 0.30.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 74b2928d..89bf148c 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ lazy val pluginSettings: Seq[Def.Setting[_]] = Seq( addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3"), addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1"), libraryDependencies ++= Seq( - "com.47deg" %% "github4s" % "0.28.5", + "com.47deg" %% "github4s" % "0.30.0", "org.http4s" %% "http4s-blaze-client" % "0.21.29", "net.jcazevedo" %% "moultingyaml" % "0.4.2", "com.lihaoyi" %% "scalatags" % "0.9.4", From 88c3d3b4ec5acfdf2389528c9299d516c7aef89a Mon Sep 17 00:00:00 2001 From: 47erbot Date: Mon, 11 Oct 2021 05:12:06 +0000 Subject: [PATCH 3/7] Update github4s to 0.30.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 73ae2ce2..8e999612 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ lazy val pluginSettings: Seq[Def.Setting[_]] = Seq( addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3"), addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1"), libraryDependencies ++= Seq( - "com.47deg" %% "github4s" % "0.28.5", + "com.47deg" %% "github4s" % "0.30.0", "org.http4s" %% "http4s-blaze-client" % "0.21.30", "net.jcazevedo" %% "moultingyaml" % "0.4.2", "com.lihaoyi" %% "scalatags" % "0.9.4", From 18478e1d25641d1e28d6e359c0b53de78e8aa046 Mon Sep 17 00:00:00 2001 From: 47erbot Date: Fri, 15 Oct 2021 05:11:06 +0000 Subject: [PATCH 4/7] Update github4s to 0.30.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 84ec83d9..f66d4349 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ lazy val pluginSettings: Seq[Def.Setting[_]] = Seq( addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3"), addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1"), libraryDependencies ++= Seq( - "com.47deg" %% "github4s" % "0.28.5", + "com.47deg" %% "github4s" % "0.30.0", "org.http4s" %% "http4s-blaze-client" % "0.21.31", "net.jcazevedo" %% "moultingyaml" % "0.4.2", "com.lihaoyi" %% "scalatags" % "0.9.4", From 3e7fad84e918f487edfe1eccff356b55a8a33682 Mon Sep 17 00:00:00 2001 From: James Santucci Date: Mon, 24 Jan 2022 15:11:43 -0600 Subject: [PATCH 5/7] Fix binary compatibility --- build.sbt | 2 +- project/dependencies.sbt | 9 +++++---- src/main/scala/microsites/MicrositeKeys.scala | 7 +++---- .../scala/microsites/github/GitHubOps.scala | 20 ++++++++++++++----- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index 38a07c1c..05e0c5c1 100644 --- a/build.sbt +++ b/build.sbt @@ -41,7 +41,7 @@ lazy val pluginSettings: Seq[Def.Setting[_]] = Seq( addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1"), libraryDependencies ++= Seq( "com.47deg" %% "github4s" % "0.30.0", - "org.http4s" %% "http4s-blaze-client" % "0.21.31", + "org.http4s" %% "http4s-blaze-client" % "0.23.7", "net.jcazevedo" %% "moultingyaml" % "0.4.2", "com.lihaoyi" %% "scalatags" % "0.11.1", "com.sksamuel.scrimage" %% "scrimage-scala" % "4.0.25", diff --git a/project/dependencies.sbt b/project/dependencies.sbt index 4b70616c..7399315d 100644 --- a/project/dependencies.sbt +++ b/project/dependencies.sbt @@ -5,8 +5,9 @@ unmanagedResourceDirectories in Compile += baseDirectory.in(ThisBuild).value.getParentFile / "src" / "main" / "resources" libraryDependencies ++= Seq( - "com.47deg" %% "github4s" % "0.24.0", - "net.jcazevedo" %% "moultingyaml" % "0.4.2", - "com.lihaoyi" %% "scalatags" % "0.11.1", - "com.sksamuel.scrimage" %% "scrimage-scala" % "4.0.25" + "com.47deg" %% "github4s" % "0.30.0", + "org.http4s" %% "http4s-blaze-client" % "0.23.7", + "net.jcazevedo" %% "moultingyaml" % "0.4.2", + "com.lihaoyi" %% "scalatags" % "0.11.1", + "com.sksamuel.scrimage" %% "scrimage-scala" % "4.0.25" ) diff --git a/src/main/scala/microsites/MicrositeKeys.scala b/src/main/scala/microsites/MicrositeKeys.scala index bb0dc64d..5d2762d7 100644 --- a/src/main/scala/microsites/MicrositeKeys.scala +++ b/src/main/scala/microsites/MicrositeKeys.scala @@ -18,7 +18,8 @@ package microsites import java.nio.file._ -import cats.effect.{ContextShift, IO, Timer} +import cats.effect.IO +import cats.effect.unsafe.implicits.global import com.typesafe.sbt.sbtghpages.GhpagesPlugin.autoImport._ import com.typesafe.sbt.site.SitePlugin.autoImport.makeSite import io.circe._ @@ -30,7 +31,7 @@ import microsites.ioops.FileWriter._ import microsites.ioops._ import microsites.ioops.syntax._ import microsites.util.MicrositeHelper -import org.http4s.client.blaze.BlazeClientBuilder +import org.http4s.blaze.client.BlazeClientBuilder import sbt.Keys._ import sbt._ import sbt.complete.DefaultParsers.OptNotSpace @@ -476,9 +477,7 @@ trait MicrositeAutoImportSettings extends MicrositeKeys { val githubRepo: String = micrositeGithubRepo.value val githubToken: Option[String] = micrositeGithubToken.value - implicit val cs: ContextShift[IO] = IO.contextShift(ExecutionContext.global) implicit val ec: ExecutionContext = ExecutionContext.global - implicit val t: Timer[IO] = IO.timer(ExecutionContext.global) lazy val log: Logger = streams.value.log diff --git a/src/main/scala/microsites/github/GitHubOps.scala b/src/main/scala/microsites/github/GitHubOps.scala index 004fea46..93728807 100644 --- a/src/main/scala/microsites/github/GitHubOps.scala +++ b/src/main/scala/microsites/github/GitHubOps.scala @@ -19,9 +19,9 @@ package microsites.github import java.io.File import cats.data.{NonEmptyList, OptionT} -import cats.effect._ +import cats.effect.{Ref => _, _} +import cats.effect.kernel.Temporal import cats.implicits._ -import com.github.marklister.base64.Base64._ import github4s._ import github4s.domain._ import microsites.Exceptions._ @@ -32,7 +32,9 @@ import org.http4s.client._ import scala.concurrent.ExecutionContext import scala.concurrent.duration._ -class GitHubOps[F[_]: ConcurrentEffect: Timer]( +import java.util.Base64 + +class GitHubOps[F[_]: Async: Temporal]( client: Client[F], owner: String, repo: String, @@ -113,7 +115,15 @@ class GitHubOps[F[_]: ConcurrentEffect: Timer]( ): F[TreeDataSha] = for { gh <- ghWithRateLimit - res <- run(gh.gitData.createBlob(owner, repo, array.toBase64, Some("base64"), headers)) + res <- run( + gh.gitData.createBlob( + owner, + repo, + Base64.getEncoder().encode(array).mkString(""), + Some("base64"), + headers + ) + ) .map(refInfo => TreeDataSha(filePath, blobMode, blobType, refInfo.sha)) } yield res @@ -210,5 +220,5 @@ class GitHubOps[F[_]: ConcurrentEffect: Timer]( // Due to GitHub abuse rate limits, we should wait 1 sec between each request // https://developer.github.com/guides/best-practices-for-integrators/#dealing-with-abuse-rate-limits - def ghWithRateLimit: F[Github[F]] = Timer[F].sleep(1.second).as(gh) + def ghWithRateLimit: F[Github[F]] = Temporal[F].sleep(1.second).as(gh) } From 970d4004ef0e4907709252ac27440c91d9bb7893 Mon Sep 17 00:00:00 2001 From: James Santucci Date: Mon, 24 Jan 2022 15:18:27 -0600 Subject: [PATCH 6/7] Remove deprecated BlazeClientBuilder with ec --- src/main/scala/microsites/MicrositeKeys.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/scala/microsites/MicrositeKeys.scala b/src/main/scala/microsites/MicrositeKeys.scala index 5d2762d7..d466a9c9 100644 --- a/src/main/scala/microsites/MicrositeKeys.scala +++ b/src/main/scala/microsites/MicrositeKeys.scala @@ -477,8 +477,6 @@ trait MicrositeAutoImportSettings extends MicrositeKeys { val githubRepo: String = micrositeGithubRepo.value val githubToken: Option[String] = micrositeGithubToken.value - implicit val ec: ExecutionContext = ExecutionContext.global - lazy val log: Logger = streams.value.log (pushSiteWith.name, gitHosting.name) match { @@ -491,7 +489,7 @@ trait MicrositeAutoImportSettings extends MicrositeKeys { | * repo: $githubOwner/$githubRepo | * commitMessage: $commitMessage""".stripMargin) - BlazeClientBuilder[IO](ec).resource + BlazeClientBuilder[IO].resource .use { client => val ghOps: GitHubOps[IO] = new GitHubOps[IO](client, githubOwner, githubRepo, githubToken) From 8438279c159bb932a8307b4c54a49b1128d25b63 Mon Sep 17 00:00:00 2001 From: James Santucci Date: Mon, 24 Jan 2022 15:25:55 -0600 Subject: [PATCH 7/7] Restore implicit execution context --- src/main/scala/microsites/MicrositeKeys.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/scala/microsites/MicrositeKeys.scala b/src/main/scala/microsites/MicrositeKeys.scala index d466a9c9..69d62151 100644 --- a/src/main/scala/microsites/MicrositeKeys.scala +++ b/src/main/scala/microsites/MicrositeKeys.scala @@ -477,6 +477,8 @@ trait MicrositeAutoImportSettings extends MicrositeKeys { val githubRepo: String = micrositeGithubRepo.value val githubToken: Option[String] = micrositeGithubToken.value + implicit val executionContext: ExecutionContext = ExecutionContext.global + lazy val log: Logger = streams.value.log (pushSiteWith.name, gitHosting.name) match {