From 742c580addf34c421e5477f934500f24481d769d Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Mon, 11 Jan 2021 13:23:56 -0800 Subject: [PATCH 1/2] Change set return type to correctly handle Null byte string response --- .gitignore | 3 ++- .../scala/io/chrisdavenport/rediculous/RedisCommands.scala | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e620014..86a261c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ tags .bloop .metals -project/metals.sbt \ No newline at end of file +metals.sbt +.vscode \ No newline at end of file diff --git a/core/src/main/scala/io/chrisdavenport/rediculous/RedisCommands.scala b/core/src/main/scala/io/chrisdavenport/rediculous/RedisCommands.scala index 4f3e317..f9665c7 100644 --- a/core/src/main/scala/io/chrisdavenport/rediculous/RedisCommands.scala +++ b/core/src/main/scala/io/chrisdavenport/rediculous/RedisCommands.scala @@ -133,7 +133,7 @@ object RedisCommands { val default = SetOpts(None, None, None, false) } - def set[F[_]: RedisCtx](key: String, value: String, setOpts: SetOpts = SetOpts.default): F[Status] = { + def set[F[_]: RedisCtx](key: String, value: String, setOpts: SetOpts = SetOpts.default): F[Option[Status]] = { val ex = setOpts.setSeconds.toList.flatMap(l => List("EX", l.encode)) val px = setOpts.setMilliseconds.toList.flatMap(l => List("PX", l.encode)) val condition = setOpts.setCondition.toList.map(_.encode) From fa65e1250fe0dfef0d9faaf1ff58f215ed90177d Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Mon, 11 Jan 2021 13:26:43 -0800 Subject: [PATCH 2/2] Use newer setup-scala --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a156660..d744427 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - uses: olafurpg/setup-scala@v7 + - uses: olafurpg/setup-scala@v10 with: java-version: ${{ matrix.java }} - name: Cache Coursier @@ -45,7 +45,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v5 + - uses: olafurpg/setup-scala@v10 - name: Cache Coursier uses: actions/cache@v1 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cb39dda..14d55d5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v1 with: fetch-depth: 0 - - uses: olafurpg/setup-scala@v5 + - uses: olafurpg/setup-scala@v10 - uses: olafurpg/setup-gpg@v2 - name: Cache Coursier uses: actions/cache@v1