Skip to content

Commit

Permalink
Scala 3.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Apr 11, 2024
1 parent e5b4d27 commit f693e17
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 10 deletions.
9 changes: 9 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ lazy val scalaz = Project(
description := "scalaz unidoc",
artifacts := Classpaths.artifactDefs(Seq(Compile / packageDoc, Compile / makePom)).value,
packagedArtifacts := Classpaths.packaged(Seq(Compile / packageDoc, Compile / makePom)).value,
ScalaUnidoc / unidoc / unidocAllSources := {
scalaBinaryVersion.value match {
case "3" =>
// TODO OutOfMemoryError
Nil
case _ =>
(ScalaUnidoc / unidoc / unidocAllSources).value
}
},
pomPostProcess := { node =>
import scala.xml._
import scala.xml.transform._
Expand Down
13 changes: 11 additions & 2 deletions project/build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ object build {

private def Scala212 = "2.12.19"
private def Scala213 = "2.13.13"
private def Scala3 = "3.1.0"
private def Scala3 = "3.3.1"

private[this] val buildInfoPackageName = "scalaz"

Expand All @@ -161,6 +161,15 @@ object build {
}
}
},
Compile / doc / sources := {
scalaBinaryVersion.value match {
case "3" =>
// TODO OutOfMemoryError
Nil
case _ =>
(Compile / doc / sources).value
}
},
(Compile / packageSrc / mappings) ++= (Compile / managedSources).value.map{ f =>
// https://github.com/sbt/sbt-buildinfo/blob/v0.7.0/src/main/scala/sbtbuildinfo/BuildInfoPlugin.scala#L58
val buildInfoDir = "sbt-buildinfo"
Expand Down Expand Up @@ -342,7 +351,7 @@ object build {
} ++ SbtOsgi.projectSettings ++ Seq[Sett](
OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package")
) ++ Def.settings(
ThisBuild / mimaReportSignatureProblems := true,
ThisBuild / mimaReportSignatureProblems := (scalaBinaryVersion.value != "3"),
mimaPreviousArtifacts := {
scalazMimaBasis.?.value.map {
organization.value % s"${name.value}_${scalaBinaryVersion.value}" % _
Expand Down
14 changes: 14 additions & 0 deletions tests/src/test/scala-2/scalaz/TagTest2.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package scalaz

import std.AllInstances._
import Tags.{Multiplication => Mult}

object TagTest2 extends SpecLite {
"k.@@" should {
"be abstract" in {
val r = (List[Int](42) ++ List[Int @@ Mult]()).toSet
r: Set[Any]
true
}
}
}
8 changes: 0 additions & 8 deletions tests/src/test/scala/scalaz/TagTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ import Tags.{Multiplication => Mult}
import org.scalacheck.Prop.forAll

object TagTest extends SpecLite {
"k.@@" should {
"be abstract" in {
val r = (List[Int](42) ++ List[Int @@ Mult]()).toSet
r: Set[Any]
true
}
}

"of.subst" should {
"substitute" ! forAll { (xs: List[Int]) =>
(Tag unwrap Foldable[List].fold(Tag.of[Mult].subst(xs))
Expand Down

0 comments on commit f693e17

Please sign in to comment.