From 173dd0c89c3d99f7edc2437dd4da93245c8b3961 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Thu, 8 Dec 2022 10:12:34 +0200 Subject: [PATCH 01/26] scaal-js 1.12.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3fe5380..9b560f4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") From 4367720f4877db2f535ba0466f4e139629f3c939 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Thu, 8 Dec 2022 10:13:38 +0200 Subject: [PATCH 02/26] sbt 1.8.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 22af262..8b9a0b0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.1 +sbt.version=1.8.0 From f80cba2ca2d39b1b492e34f823da5b44b949736d Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Thu, 8 Dec 2022 10:13:48 +0200 Subject: [PATCH 03/26] dotty-cps-async 0.9.12 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 2a81f49..379b1d2 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ //val dottyVersion = "3.0.0-RC2-bin-SNAPSHOT" -val dottyVersion = "3.2.0" +val dottyVersion = "3.2.1" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get @@ -11,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.11", + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.12", libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test, ) From 317bc0620c54192a06e36da339a6b2e8fd998b8f Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Thu, 8 Dec 2022 10:14:32 +0200 Subject: [PATCH 04/26] 3.0.5 release --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 379b1d2..d47b57c 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.2.1" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "3.0.4" +ThisBuild/version := "3.0.5" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( From 0bda21dd7374c4b760f818dce63e570c79b02507 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Fri, 23 Dec 2022 21:39:14 +0200 Subject: [PATCH 05/26] make snapshot dependency --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index d47b57c..ff94fdd 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.2.1" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "3.0.5" +ThisBuild/version := "3.0.6-SNAPSHOT" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( @@ -11,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.12", + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.14-SNAPSHOT", libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test, ) @@ -34,7 +34,7 @@ lazy val gopher = crossProject(JSPlatform, JVMPlatform) .disablePlugins(SitePlugin) .disablePlugins(SitePreviewPlugin) .jvmSettings( - scalacOptions ++= Seq( "-unchecked", "-Ycheck:macros", "-uniqid", "-Xprint:types", "-explain" ), + scalacOptions ++= Seq( "-unchecked", "-Xcheck-macros", "-Ycheck:macro", "-uniqid", "-Xprint:types", "-explain" ), fork := true, /* javaOptions ++= Seq( @@ -46,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.2" ) + mimaPreviousArtifacts := Set( "com.github.rssh" %% "scala-gopher" % "3.0.5" ) ).jsSettings( libraryDependencies += ("org.scala-js" %%% "scalajs-java-logging" % "1.0.0").cross(CrossVersion.for3Use2_13), // TODO: switch to ModuleES ? From c89863cdc2dfad53388bb8f1caaa5904d644fa1b Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Mon, 23 Jan 2023 14:47:34 +0200 Subject: [PATCH 06/26] dependency updates --- build.sbt | 6 +++--- project/build.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index ff94fdd..7315b71 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ //val dottyVersion = "3.0.0-RC2-bin-SNAPSHOT" -val dottyVersion = "3.2.1" +val dottyVersion = "3.2.2" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "3.0.6-SNAPSHOT" +ThisBuild/version := "3.0.6" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( @@ -11,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.14-SNAPSHOT", + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.15", libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test, ) diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..46e43a9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.8.2 From 401a5b9fe98049c52e58b860104bfc6e970ba2ab Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Mon, 23 Jan 2023 14:52:48 +0200 Subject: [PATCH 07/26] 3.0.7-SNAPSHOT --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7315b71..ad71ffd 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.2.2" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "3.0.6" +ThisBuild/version := "3.0.7-SNAPSHOT" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( From 987728ef44148b8cf4080071d775643cb98ac16e Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Tue, 14 Feb 2023 22:08:45 +0200 Subject: [PATCH 08/26] scala-js 1.13.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9b560f4..bdfe9a0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") From e99d8bc0b10208286dbbae20a084d2dad8d20efa Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Tue, 14 Feb 2023 22:09:18 +0200 Subject: [PATCH 09/26] dotty-cps-async snapshot --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ad71ffd..1f07a42 100644 --- a/build.sbt +++ b/build.sbt @@ -11,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.15", + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.16-SNAPSHOT", libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test, ) From dcb32420271bfccacab85c33861f1a8536d8c73f Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Mon, 20 Feb 2023 08:01:24 +0200 Subject: [PATCH 10/26] updates dotty-cps-async to 0.9.16 --- README.md | 2 +- build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bb59d4e..807c348 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ My country, Ukraine, [is being invaded by the Russian Federation, right now](htt For scala 3.1.1+: - libraryDependencies += "com.github.rssh" %% "scala-gopher" % "3.0.2" + libraryDependencies += "com.github.rssh" %% "scala-gopher" % "3.0.7" For scala 3 and 3.1.0: diff --git a/build.sbt b/build.sbt index 1f07a42..9c3b45c 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.2.2" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "3.0.7-SNAPSHOT" +ThisBuild/version := "3.0.7" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( @@ -11,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.16-SNAPSHOT", + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.16", libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test, ) From bd6e00c78d68d8ae3fc1a3fa7bfb94352ace9bfc Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Sat, 10 Jun 2023 12:23:21 +0300 Subject: [PATCH 11/26] adopted to upcoming dotty-cps-async release --- build.sbt | 10 ++++++---- shared/src/main/scala/gopher/ReadChannel.scala | 13 +++++++------ shared/src/main/scala/gopher/SelectListeners.scala | 2 +- shared/src/main/scala/gopher/SelectMacro.scala | 2 +- shared/src/main/scala/gopher/WriteChannel.scala | 8 ++++---- .../scala/gopher/monads/ReadChannelCpsMonad.scala | 2 +- 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/build.sbt b/build.sbt index 9c3b45c..3f707e1 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ //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( @@ -11,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.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( diff --git a/shared/src/main/scala/gopher/ReadChannel.scala b/shared/src/main/scala/gopher/ReadChannel.scala index 5b124b7..8daf3eb 100644 --- a/shared/src/main/scala/gopher/ReadChannel.scala +++ b/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 diff --git a/shared/src/main/scala/gopher/SelectListeners.scala b/shared/src/main/scala/gopher/SelectListeners.scala index 1444041..c3de322 100644 --- a/shared/src/main/scala/gopher/SelectListeners.scala +++ b/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()) diff --git a/shared/src/main/scala/gopher/SelectMacro.scala b/shared/src/main/scala/gopher/SelectMacro.scala index 6d53d3a..fd93363 100644 --- a/shared/src/main/scala/gopher/SelectMacro.scala +++ b/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]( diff --git a/shared/src/main/scala/gopher/WriteChannel.scala b/shared/src/main/scala/gopher/WriteChannel.scala index 758455f..a98c096 100644 --- a/shared/src/main/scala/gopher/WriteChannel.scala +++ b/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] = diff --git a/shared/src/main/scala/gopher/monads/ReadChannelCpsMonad.scala b/shared/src/main/scala/gopher/monads/ReadChannelCpsMonad.scala index b936ae4..24f17f0 100644 --- a/shared/src/main/scala/gopher/monads/ReadChannelCpsMonad.scala +++ b/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] = From 1a7514be38a701fbd29bdf73efa55fcb5aabe9ca Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Sun, 11 Jun 2023 10:11:21 +0300 Subject: [PATCH 12/26] sbt-1.9.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 46e43a9..40b3b8e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.0 From 7ce8721cdf1d5247b4d0cb0e0d7bbb4611f9e961 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Sun, 11 Jun 2023 10:27:35 +0300 Subject: [PATCH 13/26] 4.0.0 snapshot due to binary incompability caused by dotty-cps-async versions --- build.sbt | 8 ++++---- project/plugins.sbt | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 3f707e1..9bcf042 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.3.0" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "3.0.8-SNAPSHOT" +ThisBuild/version := "4.0.0-SNAPSHOT" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( @@ -11,8 +11,8 @@ 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.17-RC1", - libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test, + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.17", + libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M8" % Test, ) lazy val root = project @@ -48,7 +48,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.5" ) + mimaPreviousArtifacts := Set( "com.github.rssh" %% "scala-gopher" % "3.0.7" ) ).jsSettings( libraryDependencies += ("org.scala-js" %%% "scalajs-java-logging" % "1.0.0").cross(CrossVersion.for3Use2_13), // TODO: switch to ModuleES ? diff --git a/project/plugins.sbt b/project/plugins.sbt index bdfe9a0..9e8d881 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,8 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") From 810fcc89aa2637acff429c89d085713dcfed0ad3 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Sun, 11 Jun 2023 10:33:09 +0300 Subject: [PATCH 14/26] 4.0.1-SNAPSHOT --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9bcf042..f3911ef 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.3.0" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "4.0.0-SNAPSHOT" +ThisBuild/version := "4.0.1-SHAPSHOT" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( From 1315eb6642cfd3d6a672e4745c5a49961014fdb6 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Mon, 12 Jun 2023 23:57:27 +0300 Subject: [PATCH 15/26] rev.to 4.0.0 for tag --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f3911ef..475bbaa 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.3.0" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "4.0.1-SHAPSHOT" +ThisBuild/version := "4.0.0" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( From ca68d51ef7c0f3dd3366a24a28f1ac2d9ab0bb28 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Mon, 21 Aug 2023 15:15:41 +0300 Subject: [PATCH 16/26] 4.0.1 release for use with scala-gopher 0.4.18 --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 475bbaa..19b427e 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.3.0" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "4.0.0" +ThisBuild/version := "4.0.1" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( @@ -11,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.17", + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.18", libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M8" % Test, ) @@ -48,7 +48,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.7" ) + mimaPreviousArtifacts := Set( "com.github.rssh" %% "scala-gopher" % "4.0.0" ) ).jsSettings( libraryDependencies += ("org.scala-js" %%% "scalajs-java-logging" % "1.0.0").cross(CrossVersion.for3Use2_13), // TODO: switch to ModuleES ? From c27f1dc77643f4cc7604dd3ef84c235e938d5e56 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Mon, 2 Oct 2023 09:59:49 +0300 Subject: [PATCH 17/26] adopted to scala-3.3.1, dotty-cps-async 0.9.19 --- build.sbt | 8 ++++---- project/build.properties | 2 +- project/plugins.sbt | 2 +- shared/src/main/scala/gopher/ReadChannel.scala | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 19b427e..3c1f185 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ //val dottyVersion = "3.0.0-RC2-bin-SNAPSHOT" -val dottyVersion = "3.3.0" +val dottyVersion = "3.3.1" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "4.0.1" +ThisBuild/version := "4.0.2" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( @@ -11,8 +11,8 @@ 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.18", - libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M8" % Test, + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.19", + libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10" % Test, ) lazy val root = project diff --git a/project/build.properties b/project/build.properties index 40b3b8e..2743082 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.0 +sbt.version=1.9.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index 9e8d881..e8e217d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,6 +3,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") diff --git a/shared/src/main/scala/gopher/ReadChannel.scala b/shared/src/main/scala/gopher/ReadChannel.scala index 8daf3eb..e02ae60 100644 --- a/shared/src/main/scala/gopher/ReadChannel.scala +++ b/shared/src/main/scala/gopher/ReadChannel.scala @@ -36,7 +36,7 @@ trait ReadChannel[F[_], A]: def addDoneReader(reader: Reader[Unit]): Unit - lazy val done: ReadChannel[F,Unit] = DoneReadChannel() + final lazy val done: ReadChannel[F,Unit] = DoneReadChannel() type done = Unit From 3c6ffef3fea62433dcb11c57182d937cae8f4513 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Mon, 2 Oct 2023 10:09:40 +0300 Subject: [PATCH 18/26] updated versions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 807c348..4c9fbc3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ My country, Ukraine, [is being invaded by the Russian Federation, right now](htt For scala 3.1.1+: - libraryDependencies += "com.github.rssh" %% "scala-gopher" % "3.0.7" + libraryDependencies += "com.github.rssh" %% "scala-gopher" % "4.0.2" For scala 3 and 3.1.0: From aa716e3a8985cfd7056854d8e27d6e47f402485b Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Wed, 31 Jan 2024 12:40:39 +0200 Subject: [PATCH 19/26] scalajs 0.15.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e8e217d..d3ea172 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,6 +3,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") From 7ac03ba9e6149a5d016bc6709213123152f0cdd7 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Wed, 31 Jan 2024 12:41:00 +0200 Subject: [PATCH 20/26] dotty-cps-async 0.9.20 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3c1f185..769c11b 100644 --- a/build.sbt +++ b/build.sbt @@ -11,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.19", + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.20", libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10" % Test, ) From 4613b67fbbde3db6650d4c63cac41690b039b29d Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Wed, 31 Jan 2024 12:41:45 +0200 Subject: [PATCH 21/26] sbt-1.9.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 2743082..abbbce5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.6 +sbt.version=1.9.8 From 1c948c5e85e2091c405a7834062866b99af90c89 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Wed, 31 Jan 2024 12:42:05 +0200 Subject: [PATCH 22/26] 4.0.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 769c11b..8d85c7c 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val dottyVersion = "3.3.1" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "4.0.2" +ThisBuild/version := "4.0.3" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( From 481524a5e37540fdad8dc96a9a9bc8aa78d6bb3e Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Tue, 2 Apr 2024 13:45:56 +0300 Subject: [PATCH 23/26] scalajs-1.16.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d3ea172..e2a1a0d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,6 +3,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") From ed33f56be2ab435c8c2accfac0dfed67667591fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=AA?= Date: Mon, 26 Aug 2024 21:37:15 +1200 Subject: [PATCH 24/26] Fix flag in README.md I noticed that the flag isn't rendering correctly on my browser --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c9fbc3..bcf4127 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# πŸ‡Ί πŸ‡¦ HELP UKRAINE +# πŸ‡ΊπŸ‡¦ HELP UKRAINE I'm the creator of this project. My country, Ukraine, [is being invaded by the Russian Federation, right now](https://war.ukraine.ua). If you want to help my country to fight, consider donating to [charity supporting Ukrainian army](https://www.comebackalive.in.ua/). More options is described on [support ukraine](https://supportukrainenow.org/) site. From 216c5eeb192eaeadfa3cd70ee95c85bf9166d0b7 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Thu, 26 Dec 2024 15:02:51 +0200 Subject: [PATCH 25/26] update of dependencies --- build.sbt | 10 +++++----- project/build.properties | 2 +- project/plugins.sbt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 8d85c7c..43679a5 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ //val dottyVersion = "3.0.0-RC2-bin-SNAPSHOT" -val dottyVersion = "3.3.1" +val dottyVersion = "3.3.4" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "4.0.3" +ThisBuild/version := "4.0.5" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( @@ -11,8 +11,8 @@ 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.20", - libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M10" % Test, + libraryDependencies += "com.github.rssh" %%% "dotty-cps-async" % "0.9.23", + libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M12" % Test, ) lazy val root = project @@ -48,7 +48,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" % "4.0.0" ) + mimaPreviousArtifacts := Set( "com.github.rssh" %% "scala-gopher" % "4.0.3" ) ).jsSettings( libraryDependencies += ("org.scala-js" %%% "scalajs-java-logging" % "1.0.0").cross(CrossVersion.for3Use2_13), // TODO: switch to ModuleES ? diff --git a/project/build.properties b/project/build.properties index abbbce5..081fdbb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.10.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index e2a1a0d..fa6da8f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,6 +3,6 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1") From 51f0b1533635f63e22d7f140f0f0e3d015261fd9 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Wed, 7 May 2025 09:21:50 +0300 Subject: [PATCH 26/26] dependency updates --- build.sbt | 10 +++++----- project/plugins.sbt | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 43679a5..ce5add4 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,9 @@ //val dottyVersion = "3.0.0-RC2-bin-SNAPSHOT" -val dottyVersion = "3.3.4" +val dottyVersion = "3.3.5" //val dottyVersion = "3.1.3-RC1-bin-SNAPSHOT" //val dottyVersion = dottyLatestNightlyBuild.get -ThisBuild/version := "4.0.5" +ThisBuild/version := "4.0.7" ThisBuild/versionScheme := Some("semver-spec") val sharedSettings = Seq( @@ -11,8 +11,8 @@ 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.23", - libraryDependencies += "org.scalameta" %%% "munit" % "1.0.0-M12" % Test, + libraryDependencies += "io.github.dotty-cps-async" %%% "dotty-cps-async" % "1.0.2", + libraryDependencies += "org.scalameta" %%% "munit" % "1.0.4" % Test, ) lazy val root = project @@ -48,7 +48,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" % "4.0.3" ) + mimaPreviousArtifacts := Set( "com.github.rssh" %% "scala-gopher" % "4.0.5" ) ).jsSettings( libraryDependencies += ("org.scala-js" %%% "scalajs-java-logging" % "1.0.0").cross(CrossVersion.for3Use2_13), // TODO: switch to ModuleES ? diff --git a/project/plugins.sbt b/project/plugins.sbt index fa6da8f..3c90383 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2") addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1")