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.

Sign up for GitHub

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

Jump to bottom

Update To Latest ZIO Version #674

Merged
merged 2 commits into from
Sep 12, 2023
Merged

Update To Latest ZIO Version #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a92f39
update to latest zio version
adamgfraser Aug 23, 2023
173634b
update scala 3 version
adamgfraser Aug 23, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
fail-fast: false
matrix:
java: ['[email protected]', '[email protected]']
scala: ['2.12.17', '2.13.10', '3.2.1']
scala: ['2.12.17', '2.13.10', '3.3.0']
platform: ['JVM', 'JS']
steps:
- name: Checkout current branch
Expand All @@ -45,10 +45,10 @@ jobs:
- name: Cache scala dependencies
uses: coursier/cache-action@v5
- name: Run tests
if: matrix.scala != '3.2.1'
if: matrix.scala != '3.3.0'
run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
- name: Run dotty tests
if: matrix.scala == '3.2.1' && matrix.platform == 'JVM'
if: matrix.scala == '3.3.0' && matrix.platform == 'JVM'
run: sbt ++${{ matrix.scala }}! testJVM

ci:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ lazy val root = project
unusedCompileDependenciesFilter -= moduleFilter("org.scala-js", "scalajs-library")
)

val zioVersion = "2.0.13"
val zioVersion = "2.0.16"
val catsVersion = "2.9.0"
val catsEffectVersion = "3.4.8"
val catsMtlVersion = "1.3.0"
Expand Down
4 changes: 2 additions & 2 deletions project/BuildHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object BuildHelper {

val Scala212 = "2.12.17"
val Scala213 = "2.13.10"
val Scala3 = "3.2.1"
val Scala3 = "3.3.0"

private val stdOptions = Seq(
"-deprecation",
Expand Down Expand Up @@ -61,7 +61,7 @@ object BuildHelper {

def extraOptions(scalaVersion: String, optimize: Boolean) =
CrossVersion.partialVersion(scalaVersion) match {
case Some((3, 2)) =>
case Some((3, 3)) =>
std3xOptions
case Some((2, 13)) =>
Seq(
Expand Down
13 changes: 5 additions & 8 deletions zio-interop-cats-tests/shared/src/test/scala/zio/interop/CatsSpecBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,11 @@ private[zio] trait CatsSpecBase

implicit def runtime(implicit ticker: Ticker): Runtime[Any] = {
val tickerExecutor = Executor.fromExecutionContext(ticker.ctx)
val fiberId = Unsafe.unsafe(implicit u => FiberId.make(Trace.empty))
val fiberRefs = FiberRefs(
Map(
FiberRef.overrideExecutor -> ::(fiberId -> Some(tickerExecutor), Nil),
FiberRef.currentBlockingExecutor -> ::(fiberId -> tickerExecutor, Nil),
DefaultServices.currentServices -> ::(fiberId -> DefaultServices.live.add[Clock](testClock), Nil)
)
)
val fiberId = FiberId.make(Trace.empty)(Unsafe.unsafe)
val fiberRefs = FiberRefs.empty
.updatedAs(fiberId)(FiberRef.overrideExecutor, Some(tickerExecutor))
.updatedAs(fiberId)(FiberRef.currentBlockingExecutor, tickerExecutor)
.updatedAs(fiberId)(DefaultServices.currentServices, DefaultServices.live.add[Clock](testClock))
val runtimeFlags = RuntimeFlags.default
Runtime(ZEnvironment.empty, fiberRefs, runtimeFlags)
}
Expand Down
Loading