Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade versions #654

Merged
merged 4 commits into from
Oct 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
fail-fast: false
matrix:
java: ['17']
scala: ['2.12.16', '2.13.8', '3.1.3']
scala: ['2.12.16', '2.13.8', '3.2.0']
steps:
- name: Checkout current branch
uses: actions/checkout@v3.1.0
Expand All @@ -66,7 +66,7 @@ jobs:
fail-fast: false
matrix:
java: ['8', '11', '17']
scala: ['2.12.16', '2.13.8', '3.1.3']
scala: ['2.12.16', '2.13.8', '3.2.0']
steps:
- name: Checkout current branch
uses: actions/checkout@v3.1.0
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ lazy val redis =
.settings(stdSettings("zio-redis"))
.settings(
libraryDependencies ++= List(
"dev.zio" %% "zio-streams" % "2.0.1",
"dev.zio" %% "zio-streams" % "2.0.2",
"dev.zio" %% "zio-logging" % "2.1.1",
"dev.zio" %% "zio-schema" % "0.2.1",
"dev.zio" %% "zio-schema-protobuf" % "0.2.1" % Test,
"dev.zio" %% "zio-test" % "2.0.1" % Test,
"dev.zio" %% "zio-test-sbt" % "2.0.1" % Test,
"dev.zio" %% "zio-test" % "2.0.2" % Test,
"dev.zio" %% "zio-test-sbt" % "2.0.2" % Test,
"org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1"
),
testFrameworks := List(new TestFramework("zio.test.sbt.ZTestFramework"))
Expand Down Expand Up @@ -76,14 +76,14 @@ lazy val example =
.settings(
publish / skip := true,
libraryDependencies ++= List(
"com.softwaremill.sttp.client3" %% "async-http-client-backend-zio" % "3.7.6",
"com.softwaremill.sttp.client3" %% "zio-json" % "3.7.6",
"dev.zio" %% "zio-streams" % "2.0.1",
"com.softwaremill.sttp.client3" %% "async-http-client-backend-zio" % "3.8.0",
"com.softwaremill.sttp.client3" %% "zio-json" % "3.8.0",
"dev.zio" %% "zio-streams" % "2.0.2",
"dev.zio" %% "zio-config-magnolia" % "3.0.2",
"dev.zio" %% "zio-config-typesafe" % "3.0.2",
"dev.zio" %% "zio-schema-protobuf" % "0.2.1",
"dev.zio" %% "zio-json" % "0.3.0-RC11",
"io.d11" %% "zhttp" % "2.0.0-RC10"
"io.d11" %% "zhttp" % "2.0.0-RC11"
)
)

Expand Down
4 changes: 2 additions & 2 deletions example/src/main/scala/example/ApiError.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ sealed trait ApiError extends NoStackTrace { self =>
final def toResponse: Response =
self match {
case CorruptedData | GithubUnreachable => Response.fromHttpError(HttpError.InternalServerError())
case CacheMiss(key) => Response.fromHttpError(HttpError.NotFound(Path.empty / key))
case UnknownProject(path) => Response.fromHttpError(HttpError.NotFound(Path.root / path))
case CacheMiss(key) => Response.fromHttpError(HttpError.NotFound((Path.empty / key).encode))
case UnknownProject(path) => Response.fromHttpError(HttpError.NotFound((Path.root / path).encode))
}
}

Expand Down
6 changes: 3 additions & 3 deletions redis/src/test/scala/zio/redis/ApiSpec.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package zio.redis

import zio._
import zio.test.TestAnnotation
import zio.test.TestAspect._
import zio.test._

object ApiSpec
extends ConnectionSpec
Expand Down Expand Up @@ -31,7 +31,7 @@ object ApiSpec
hashSuite,
streamsSuite,
scriptingSpec
).provideCustomLayerShared(LiveLayer) @@ sequential @@ withLiveEnvironment,
).provideLayerShared(LiveLayer) @@ sequential @@ withLiveEnvironment,
suite("Test Executor")(
connectionSuite,
keysSuite,
Expand All @@ -44,7 +44,7 @@ object ApiSpec
stringsSuite
).filterAnnotations(TestAnnotation.tagged)(t => !t.contains(BaseSpec.TestExecutorUnsupported))
.get
.provideCustomLayer(TestLayer)
.provideLayer(TestLayer)
)

private val LiveLayer =
Expand Down
2 changes: 1 addition & 1 deletion redis/src/test/scala/zio/redis/ByteStreamSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ object ByteStreamSpec extends BaseSpec {
res <- stream.read.runHead
} yield assert(res)(isSome(equalTo('*'.toByte)))
}
).provideCustomLayer(ByteStream.default)
).provideLayer(ByteStream.default)
}
2 changes: 1 addition & 1 deletion redis/src/test/scala/zio/redis/HashSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import zio.test.Assertion._
import zio.test._

trait HashSpec extends BaseSpec {
def hashSuite: Spec[TestConfig with Redis, RedisError] =
def hashSuite: Spec[Redis, RedisError] =
suite("hash")(
suite("hSet, hGet, hGetAll and hDel")(
test("set followed by get") {
Expand Down
2 changes: 1 addition & 1 deletion redis/src/test/scala/zio/redis/KeysSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import zio.test.TestAspect.{restore => _, _}
import zio.test._

trait KeysSpec extends BaseSpec {
def keysSuite: Spec[Redis with TestEnvironment, RedisError] = {
def keysSuite: Spec[Redis, RedisError] = {
suite("keys")(
test("set followed by get") {
for {
Expand Down
2 changes: 1 addition & 1 deletion redis/src/test/scala/zio/redis/StreamsSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import zio.test.TestAspect.ignore
import zio.test._

trait StreamsSpec extends BaseSpec {
def streamsSuite: Spec[Redis with TestEnvironment, RedisError] =
def streamsSuite: Spec[Redis, RedisError] =
suite("streams")(
suite("xAck")(
test("one message") {
Expand Down
2 changes: 1 addition & 1 deletion redis/src/test/scala/zio/redis/StringsSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import zio.test.TestAspect.{eventually, ignore}
import zio.test._

trait StringsSpec extends BaseSpec {
def stringsSuite: Spec[Redis with TestEnvironment, RedisError] =
def stringsSuite: Spec[Redis, RedisError] =
suite("strings")(
suite("append")(
test("to the end of non-empty string") {
Expand Down