adopted to upcoming dotty-cps-async release

Author: rssh

build.sbt

@@ -1,17 +1,17 @@
 //val dottyVersion = "3.0.0-RC2-bin-SNAPSHOT"
-val dottyVersion = "3.2.2"
+val dottyVersion = "3.3.0"
 //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT"
 //val dottyVersion = dottyLatestNightlyBuild.get
 
-ThisBuild/version := "3.0.7"
+ThisBuild/version := "3.0.8-SNAPSHOT"
 ThisBuild/versionScheme := Some("semver-spec")
 
 val sharedSettings = Seq(
     organization := "com.github.rssh",
     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.16",
+    libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.17-RC1",
     libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test,
 )
 
@@ -34,7 +34,9 @@ lazy val gopher = crossProject(JSPlatform, JVMPlatform)
     .disablePlugins(SitePlugin)
     .disablePlugins(SitePreviewPlugin)
     .jvmSettings(
-        scalacOptions ++= Seq( "-unchecked", "-Xcheck-macros", "-Ycheck:macro", "-uniqid", "-Xprint:types", "-explain" ),
+        //scalacOptions ++= Seq( "-unchecked", "-Xcheck-macros", "-Ycheck:macro", "-uniqid", "-Xprint:types", "-explain" ),
+        // Error in dotty
+        scalacOptions ++= Seq( "-unchecked", "-Xprint:types" ),
         fork := true,
         /*
         javaOptions ++= Seq(

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

@@ -52,12 +52,13 @@ 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[G[_]]()(using mc:CpsMonadContext[G]): A = await(aread())(using rAsyncMonad, mc)
+   transparent inline def read[G[_]]()(using mc:CpsMonadContext[G], fg:CpsMonadConversion[F,G]): A = 
+     await(aread())
 
    /**
    * Synonim for read.
    */
-   transparent inline def ?(using mc:CpsMonadContext[F]) : A = await(aread())(using rAsyncMonad, mc)
+   transparent inline def ?(using mc:CpsMonadContext[F]) : A = await(aread())
 
   /**
    * return F which contains sequence from first `n` elements.
@@ -84,7 +85,7 @@ trait ReadChannel[F[_], A]:
    * should be called inside async block. 
    **/   
    transparent inline def take(n: Int)(using CpsMonadContext[F]): IndexedSeq[A] =
-      await(atake(n))(using rAsyncMonad)
+      await(atake(n))
 
    /**
     * read value and return future with
@@ -107,7 +108,7 @@ trait ReadChannel[F[_], A]:
     *
     * should be called inside async block.
     **/   
-   transparent inline def optRead()(using CpsMonadContext[F]): Option[A] = await(aOptRead())(using rAsyncMonad)
+   transparent inline def optRead()(using CpsMonadContext[F]): Option[A] = await(aOptRead())
 
    def foreach_async(f: A=>F[Unit]): F[Unit] =
       given CpsAsyncMonad[F] = asyncMonad
@@ -131,7 +132,7 @@ trait ReadChannel[F[_], A]:
    * until end of stream is not reached
    **/  
    transparent inline def foreach(inline f: A=>Unit)(using CpsMonadContext[F]): Unit = 
-      await(aforeach(f))(using rAsyncMonad)
+      await(aforeach(f))
 
 
    def map[B](f: A=>B): ReadChannel[F,B] =
@@ -171,7 +172,7 @@ trait ReadChannel[F[_], A]:
       }
 
    transparent inline def fold[S](inline s0:S)(inline f: (S,A) => S )(using mc:CpsMonadContext[F]): S =
-      await[F,S,F](afold(s0)(f))(using rAsyncMonad, mc)   
+      await[F,S,F](afold(s0)(f))
 
    def zip[B](x: ReadChannel[F,B]): ReadChannel[F,(A,B)] = 
       given CpsSchedulingMonad[F] = asyncMonad

shared/src/main/scala/gopher/SelectListeners.scala

@@ -16,7 +16,7 @@ trait SelectListeners[F[_],S, R]:
 
   def  runAsync():F[R]
 
-  transparent inline def run()(using CpsMonadContext[F]): R = await(runAsync())(using asyncMonad)
+  transparent inline def run()(using CpsMonadContext[F]): R = await(runAsync())
 
 
 

shared/src/main/scala/gopher/SelectMacro.scala

@@ -56,7 +56,7 @@ object SelectMacro:
            )(using Quotes): Expr[R] =
             val g = selectListenerBuilder(constructor, caseDefs)
             //  dotty bug if g.run
-            val r = '{ await($g.runAsync())(using ${api}.asyncMonad, $monadContext) } 
+            val r = '{ await($g.runAsync())(using $monadContext, CpsMonadConversion.identityConversion[F]) } 
             r.asExprOf[R]
 
   def buildSelectListenerRunAsync[F[_]:Type, S:Type, R:Type, L <: SelectListeners[F,S,R]:Type](

shared/src/main/scala/gopher/WriteChannel.scala

@@ -23,13 +23,13 @@ trait WriteChannel[F[_], A]:
    //   inline def apply(a:A): Unit = await(awrite(a))(using asyncMonad) 
    //   inline def unapply(a:A): Some[A] = ???
 
-   transparent inline def write(inline a:A)(using CpsMonadContext[F]): Unit = await(awrite(a))(using asyncMonad)
+   transparent inline def write(inline a:A)(using CpsMonadContext[F]): Unit = await(awrite(a))
 
    @targetName("write1")
-   transparent inline def <~ (inline a:A)(using CpsMonadContext[F]): Unit = await(awrite(a))(using asyncMonad) 
+   transparent inline def <~ (inline a:A)(using CpsMonadContext[F]): Unit = await(awrite(a))
 
    @targetName("write2")
-   transparent inline def ! (inline a:A)(using CpsMonadContext[F]): Unit = await(awrite(a))(using asyncMonad) 
+   transparent inline def ! (inline a:A)(using CpsMonadContext[F]): Unit = await(awrite(a)) 
 
 
    //def Write(x:A):WritePattern = new WritePattern(x)
@@ -52,7 +52,7 @@ trait WriteChannel[F[_], A]:
       }
 
    transparent inline def writeAll(inline collection: IterableOnce[A])(using mc: CpsMonadContext[F]): Unit = 
-      await(awriteAll(collection))(using asyncMonad, mc)
+      await(awriteAll(collection))
 
 
    def withWriteExpiration(ttl: FiniteDuration, throwTimeouts: Boolean)(using gopherApi: Gopher[F]): WriteChannelWithExpiration[F,A] =

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

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