adopted to dotty-cps-async 0.9.8

Author: rssh

README.md

@@ -6,7 +6,7 @@
 
 For scala 3.1.1+:
 
-    libraryDependencies += "com.github.rssh" %% "scala-gopher" % "3.0.1"
+    libraryDependencies += "com.github.rssh" %% "scala-gopher" % "3.0.2"
 
 For scala 3 and 3.1.0:
 

build.sbt

@@ -1,5 +1,6 @@
 //val dottyVersion = "3.0.0-RC2-bin-SNAPSHOT"
 val dottyVersion = "3.1.1"
+//val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT"
 //val dottyVersion = dottyLatestNightlyBuild.get
 
 ThisBuild/version := "3.0.2-SNAPSHOT"
@@ -10,7 +11,7 @@ val sharedSettings = Seq(
     scalaVersion := dottyVersion,
     name := "scala-gopher",
     resolvers += "Local Ivy Repository" at "file://"+Path.userHome.absolutePath+"/.ivy2/local",
-    libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.7",
+    libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.8",
     libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test,
 )
 
@@ -26,14 +27,14 @@ lazy val root = project
   ).enablePlugins(GhpagesPlugin, SiteScaladocPlugin)
 
 
-
+// for scala-native support we need munit 
 lazy val gopher = crossProject(JSPlatform, JVMPlatform)
     .in(file("."))
     .settings(sharedSettings)
     .disablePlugins(SitePlugin)
     .disablePlugins(SitePreviewPlugin)
     .jvmSettings(
-        scalacOptions ++= Seq( "-unchecked", "-Ycheck:macros", "-uniqid", "-Xprint:types" ),
+        scalacOptions ++= Seq( "-unchecked", "-Ycheck:macros", "-uniqid", "-Xprint:types", "-explain" ),
         fork := true,
         /*
         javaOptions ++= Seq(
@@ -45,7 +46,7 @@ lazy val gopher = crossProject(JSPlatform, JVMPlatform)
         Compile / doc / scalacOptions := Seq("-groups",
                 "-source-links:shared=github://rssh/scala-gopher/master#shared",
                 "-source-links:jvm=github://rssh/scala-gopher/master#jvm"),
-        mimaPreviousArtifacts := Set( "com.github.rssh" %% "scala-gopher" % "3.0.0" )  
+        mimaPreviousArtifacts := Set( "com.github.rssh" %% "scala-gopher" % "3.0.1" )  
     ).jsSettings(
         libraryDependencies += ("org.scala-js" %%% "scalajs-java-logging" % "1.0.0").cross(CrossVersion.for3Use2_13),
         // TODO: switch to ModuleES ?

shared/src/main/scala/gopher/ReadChannel.scala

@@ -52,12 +52,12 @@ trait ReadChannel[F[_], A]:
     * Can be used only inside async block.
     * If stream is closed and no values to read left in the stream - throws StreamClosedException
     **/   
-   transparent inline def read()(using CpsMonadContext[F]): A = await(aread())(using rAsyncMonad)
+   transparent inline def read[G[_]]()(using mc:CpsMonadContext[G]): A = await(aread())(using rAsyncMonad, mc)
 
    /**
    * Synonim for read.
    */
-   transparent inline def ?(using CpsMonadContext[F]) : A = await(aread())(using rAsyncMonad)
+   transparent inline def ?(using mc:CpsMonadContext[F]) : A = await(aread())(using rAsyncMonad, mc)
 
   /**
    * return F which contains sequence from first `n` elements.

shared/src/main/scala/gopher/Select.scala

@@ -67,7 +67,7 @@ class Select[F[_]](api: Gopher[F]):
     }
   }
 
-  transparent inline def afold[S](s0:S)(inline step: S => S | SelectFold.Done[S]) : F[S] =
+  transparent inline def afold[S](s0:S)(inline step: CpsMonadContext[F] ?=> S => S | SelectFold.Done[S]) : F[S] =
     given CpsAsyncMonad[F] = api.asyncMonad
     async[F]{ 
       fold(s0)(step)

shared/src/main/scala/gopher/monads/ReadChannelCpsMonad.scala

@@ -6,7 +6,8 @@ import cps._
 import gopher.impl._
 
 
-given ReadChannelCpsMonad[F[_]](using Gopher[F]): CpsMonad[[A] =>> ReadChannel[F,A]] with CpsMonadInstanceContext[[A] =>> ReadChannel[F,A]] with
+
+given ReadChannelCpsMonad[F[_]](using Gopher[F]): CpsMonadInstanceContext[[A] =>> ReadChannel[F,A]] with
 
 
   def pure[T](t:T): ReadChannel[F,T] = 

shared/src/test/scala/gopher/monads/ChannelMonadSuite.scala

@@ -8,8 +8,8 @@ import scala.concurrent.*
 import scala.concurrent.duration.*
 import scala.collection.SortedSet
 
-import cps.monads.FutureAsyncMonad
-import gopher.monads.given
+import cps.monads.{given,*}
+import gopher.monads.{given,*}
 
 class ChannelMonadSuite extends FunSuite {
 
@@ -19,17 +19,21 @@ class ChannelMonadSuite extends FunSuite {
 
   test("using channel as monad and read inside") {
 
-       val chX = ReadChannel.fromValues(1,2,3,4,5)
-       val chY = ReadChannel.fromValues(1,2,3,4,5)
+       
+       val chX = ReadChannel.fromValues[Future,Int](1,2,3,4,5)
+       val chY = ReadChannel.fromValues[Future,Int](1,2,3,4,5)
 
-       val squares = async[[X] =>> ReadChannel[Future,X]] {
-        val x = await(chX)
+       
+       val squares: ReadChannel[Future,Int] = async[[X] =>> ReadChannel[Future,X]] { 
+        val x: Int = await(chX)
         //println(s"reading from X $x")
-        val y = chY.read()
+        val y: Int = chY.read()
         //println(s"reading from Y  $y")
         x*y
        }
+       
 
+       
        async[Future] {
          val a1 = squares.read()
          //println(s"a1==${a1}")
@@ -46,6 +50,7 @@ class ChannelMonadSuite extends FunSuite {
        }
 
   }
+  
 
   test("using channel with flatMap") {