Skip to content

Commit

Permalink
Update scala-library, scala-reflect to 2.13.12 (#345)
Browse files Browse the repository at this point in the history
* Update scala-library, scala-reflect to 2.13.12

* fix warnings

---------

Co-authored-by: johannes karoff <johannes@karoff.net>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 10, 2023
1 parent 19a4bcf commit 4121a1c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
build:
strategy:
matrix:
scalaVersion: ["2.13.11", "3.3.1"]
scalaVersion: ["2.13.12", "3.3.1"]
runs-on: ubuntu-22.04

steps:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04]
scala: [2.13.11]
scala: [2.13.12]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ inThisBuild(
)

lazy val commonSettings = Seq(
crossScalaVersions := Seq("2.13.11", "3.3.1"),
scalaVersion := "2.13.11",
crossScalaVersions := Seq("2.13.12", "3.3.1"),
scalaVersion := "2.13.12",
libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq.empty
case _ =>
Expand Down Expand Up @@ -110,7 +110,7 @@ lazy val rx = project
.settings(commonSettings)
.settings(
name := "colibri-rx",
crossScalaVersions := Seq("2.13.11"), // no scala3, because scala.rx uses scala2 macros
crossScalaVersions := Seq("2.13.12"), // no scala3, because scala.rx uses scala2 macros
libraryDependencies ++= Seq(
"com.lihaoyi" %% "scalarx" % "0.4.3",
),
Expand Down
13 changes: 7 additions & 6 deletions reactive/src/main/scala/colibri/reactive/Reactive.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import monocle.{Iso, Lens, Prism}
import scala.concurrent.Future
import scala.reflect.ClassTag
import scala.util.control.NonFatal
import scala.annotation.unused

object RxMissingNowException
extends Exception(
Expand Down Expand Up @@ -395,9 +396,9 @@ private final class RxConst[A](value: A) extends Rx[A] {

val observable: Observable[A] = Observable.pure(value)

def apply()(implicit owner: LiveOwner): A = value
def now()(implicit owner: NowOwner): A = value
def nowIfSubscribedOption(): Option[A] = someValue
def apply()(implicit @unused owner: LiveOwner): A = value
def now()(implicit @unused owner: NowOwner): A = value
def nowIfSubscribedOption(): Option[A] = someValue
}

private final class RxSyncObservable[A](inner: Observable[A]) extends Rx[A] {
Expand Down Expand Up @@ -473,9 +474,9 @@ private final class VarSubject[A](seed: A) extends Var[A] {
val observable: Observable[A] = state.distinctOnEquals
def observer: Observer[A] = state

def apply()(implicit owner: LiveOwner) = owner.unsafeLive(this)
def now()(implicit owner: NowOwner) = state.now()
def nowIfSubscribedOption() = Some(state.now())
def apply()(implicit owner: LiveOwner) = owner.unsafeLive(this)
def now()(implicit @unused owner: NowOwner) = state.now()
def nowIfSubscribedOption() = Some(state.now())
}

private final class VarCreateStateless[A](innerWrite: RxWriter[A], innerRead: Rx[A]) extends Var[A] {
Expand Down

0 comments on commit 4121a1c

Please sign in to comment.