Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Commit

Permalink
Scala 3.0.0-RC1 (#243)
Browse files Browse the repository at this point in the history
  • Loading branch information
larsrh authored Feb 18, 2021
1 parent 2683396 commit 56f6e51
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.12.13, 2.13.4, 3.0.0-M2, 3.0.0-M3]
scala: [2.12.13, 2.13.4, 3.0.0-M3, 3.0.0-RC1]
java: [adopt@1.8]
platform: [jvm, js, native]
exclude:
- platform: native
scala: 3.0.0-M2
- platform: native
scala: 3.0.0-M3
- platform: native
scala: 3.0.0-RC1
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import microsites.ExtraMdFileConfig
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
import com.typesafe.tools.mima.core._

lazy val catsVersion = "2.4.1"
lazy val mUnit = "0.7.21"
lazy val disciplineMUnit = "1.0.5"
lazy val catsVersion = "2.4.2"
lazy val mUnit = "0.7.22"
lazy val disciplineMUnit = "1.0.6"

val Scala212 = "2.12.13"
val Scala213 = "2.13.4"
val Scala300 = Seq("3.0.0-M2", "3.0.0-M3")
val Scala300 = Seq("3.0.0-M3", "3.0.0-RC1")

ThisBuild / crossScalaVersions := Seq(Scala212, Scala213) ++ Scala300
ThisBuild / scalaVersion := Scala213
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ trait BoundedDistributiveLattice[@sp(Int, Long, Float, Double) A] extends Any wi
}

object BoundedDistributiveLattice extends
BoundedMeetSemilatticeFunctions[BoundedDistributiveLattice] with
BoundedJoinSemilatticeFunctions[BoundedDistributiveLattice] {
BoundedMeetSemilatticeFunctions[BoundedDistributiveLattice]
with BoundedJoinSemilatticeFunctions[BoundedDistributiveLattice] {

/**
* Access an implicit `BoundedDistributiveLattice[A]`.
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/algebra/lattice/BoundedLattice.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ trait BoundedLattice[@sp(Int, Long, Float, Double) A] extends Any with Lattice[A
}

object BoundedLattice extends
BoundedMeetSemilatticeFunctions[BoundedLattice] with
BoundedJoinSemilatticeFunctions[BoundedLattice] {
BoundedMeetSemilatticeFunctions[BoundedLattice]
with BoundedJoinSemilatticeFunctions[BoundedLattice] {

/**
* Access an implicit `BoundedLattice[A]`.
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/scala/algebra/lattice/DeMorgan.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ trait DeMorgan[@sp(Int, Long) A] extends Any with Logic[A] { self =>
}

trait DeMorganFunctions[H[A] <: DeMorgan[A]] extends
BoundedMeetSemilatticeFunctions[H] with
BoundedJoinSemilatticeFunctions[H] with
LogicFunctions[H]
BoundedMeetSemilatticeFunctions[H]
with BoundedJoinSemilatticeFunctions[H]
with LogicFunctions[H]


object DeMorgan extends DeMorganFunctions[DeMorgan] {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/algebra/lattice/Heyting.scala
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ trait HeytingGenBoolOverlap[H[A] <: Heyting[A]] {
}

trait HeytingFunctions[H[A] <: Heyting[A]] extends
BoundedMeetSemilatticeFunctions[H] with
BoundedJoinSemilatticeFunctions[H] {
BoundedMeetSemilatticeFunctions[H]
with BoundedJoinSemilatticeFunctions[H] {

def complement[@sp(Int, Long) A](x: A)(implicit ev: H[A]): A =
ev.complement(x)
Expand Down

0 comments on commit 56f6e51

Please sign in to comment.