From 8d908d9818b9ac9369ae7f0fe807327a4ae6e96c Mon Sep 17 00:00:00 2001 From: Mark Canlas Date: Thu, 1 Dec 2022 08:17:33 -0500 Subject: [PATCH] use rufio instead --- .github/workflows/ci.yml | 3 +++ build.sbt | 10 ++++++++++ .../scala/com/htmlism/firepower/demo/File.scala | 9 --------- .../com/htmlism/firepower/demo/PrintPrograms.scala | 2 ++ .../scala/com/htmlism/firepower/demo/package.scala | 13 ------------- project/GitHubActionsSettings.scala | 3 ++- 6 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 firepower-demo/src/main/scala/com/htmlism/firepower/demo/File.scala delete mode 100644 firepower-demo/src/main/scala/com/htmlism/firepower/demo/package.scala diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ebe50c..4c266a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,9 @@ on: push: branches: ['**'] +env: + GH_PACKAGES_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN }} + jobs: build: name: Build and Test diff --git a/build.sbt b/build.sbt index d6e17bd..957b43e 100644 --- a/build.sbt +++ b/build.sbt @@ -19,3 +19,13 @@ lazy val scratchpad = lazy val demo = module("demo") .withEfectMonad + .settings(libraryDependencies += "com.htmlism" %% "rufio-zio" % "71-5394aaef") + +ThisBuild / resolvers += "mcanlas/rufio" at "https://maven.pkg.github.com/mcanlas/rufio/" + +ThisBuild / credentials += Credentials( + "GitHub Package Registry", + "maven.pkg.github.com", + "mcanlas", + sys.env("GH_PACKAGES_TOKEN") +) diff --git a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/File.scala b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/File.scala deleted file mode 100644 index ffa383e..0000000 --- a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/File.scala +++ /dev/null @@ -1,9 +0,0 @@ -package com.htmlism.firepower.demo - -import java.nio.file.Path - -case class File(path: Path) - -object File: - def apply(first: String, fragments: String*): File = - File(Path.of(first, fragments: _*)) diff --git a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala index 4fe4efe..f488537 100644 --- a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala +++ b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/PrintPrograms.scala @@ -4,6 +4,8 @@ import zio.* import java.io.IOException +import com.htmlism.rufio.withzio._ + object PrintPrograms extends ZIOAppDefault: def run: ZIO[Any, Throwable, Unit] = File("data/example.txt") diff --git a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/package.scala b/firepower-demo/src/main/scala/com/htmlism/firepower/demo/package.scala deleted file mode 100644 index 4a84f72..0000000 --- a/firepower-demo/src/main/scala/com/htmlism/firepower/demo/package.scala +++ /dev/null @@ -1,13 +0,0 @@ -package com.htmlism.firepower - -import java.nio.charset.Charset -import java.nio.file.Files - -import zio.* - -package object demo: - implicit class FileOps(f: demo.File): - def contents: Task[String] = - ZIO.attempt { - Files.readAllBytes(f.path) - }.map(xs => new String(xs, Charset.defaultCharset())) diff --git a/project/GitHubActionsSettings.scala b/project/GitHubActionsSettings.scala index 77be4b9..e37aab5 100644 --- a/project/GitHubActionsSettings.scala +++ b/project/GitHubActionsSettings.scala @@ -1,4 +1,5 @@ import sbt._ +import sbt.Keys._ import sbtghactions._ import sbtghactions.GenerativeKeys._ @@ -17,7 +18,7 @@ object GitHubActionsSettings extends AutoPlugin { override val buildSettings: Seq[Setting[_]] = Seq( githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("scalafmtCheck", "test"))), - githubWorkflowEnv := Map.empty, + githubWorkflowEnv := Map("GH_PACKAGES_TOKEN" -> "${{ secrets.GH_PACKAGES_TOKEN }}"), githubWorkflowPublishTargetBranches := Nil, githubWorkflowIncludeClean := false )