Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scala 2.12.12 and 2.13.3 #247

Merged
merged 1 commit into from
Aug 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
language: scala

scala:
- 2.12.11
- 2.13.2
- 2.12.12
- 2.13.3

jdk:
- openjdk8

cache:
directories:
- "$HOME/.cache/coursier"
- "$HOME/.ivy2/cache"
- "$HOME/.sbt"

Expand Down
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._

lazy val buildSettings = Seq(
organization := "org.typelevel",
scalaVersion := "2.13.2",
crossScalaVersions := Seq("2.12.11", scalaVersion.value)
scalaVersion := "2.13.3",
crossScalaVersions := Seq("2.12.12", scalaVersion.value)
)

val catsVersion = "2.1.1"
Expand All @@ -18,7 +18,8 @@ lazy val commonSettings = Seq(
"-language:higherKinds",
"-language:implicitConversions",
"-unchecked",
"-deprecation"
"-deprecation",
"-Xfatal-warnings"
),
scalacOptions ++= (
CrossVersion.partialVersion(scalaVersion.value) match {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ object VersionSpecific {

@implicitNotFound("could not find Lazy implicit value of type ${A}")
abstract class Lazy[+A] extends Serializable {
def value(): A
def value: A
}

object Lazy {
implicit def instance[A](implicit ev: => A): Lazy[A] = () => ev
implicit def instance[A](implicit ev: => A): Lazy[A] = new Lazy[A] {
def value: A = ev
}
}

sealed trait OrElse[+A, +B] extends Serializable {
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/cats/derived/iterable.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ trait MkIterable[F[_]] {
}
}

def next: A =
def next(): A =
if (!hasNext) Iterator.empty.next()
else (first: @unchecked) match {
case IterState.Return(a) =>
first = IterState.Done
a
case IterState.Iterate(it) =>
it.next
it.next()
}
}
}
Expand Down