Skip to content

Commit d123047

Browse files
committed
workaround: comment out lines to compile
1 parent 9f3722b commit d123047

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

algebird-core/src/main/scala-3/com/twitter/algebird/AdaptiveVector.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ sealed trait AdaptiveVector[V] extends IndexedSeq[V] {
176176

177177
/** How many items are not sparse */
178178
def denseCount: Int
179-
def size: Int
179+
// def size: Int
180180
override def apply(idx: Int): V
181181
def updated(idx: Int, v: V): AdaptiveVector[V]
182182

algebird-core/src/main/scala-3/com/twitter/algebird/compat.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ private[algebird] trait CompatFold {
3131
private[algebird] trait CompatDecayedVector {
3232
// This is the default monoid that never thresholds.
3333
// If you want to set a specific accuracy you need to implicitly override this
34-
implicit def monoid[F, C[_]](implicit vs: VectorSpace[F, C], metric: Metric[C[F]]):Monoid[DecayedVector[C]] =
35-
DecayedVector.monoidWithEpsilon(-1.0)
34+
// implicit def monoid[F, C[_]](implicit vs: VectorSpace[F, C], metric: Metric[C[F]]):Monoid[DecayedVector[C]] =
35+
// DecayedVector.monoidWithEpsilon(-1.0)
3636
}
37+

build.sbt

+6
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ def scalaVersionSpecificJavaFolders(srcBaseDir: java.io.File, scalaVersion: Stri
3939
new java.io.File(s"${srcBaseDir.getPath}-2.12-") :: Nil
4040
case Some((2, y)) if y >= 13 =>
4141
new java.io.File(s"${srcBaseDir.getPath}-2.13+") :: Nil
42+
case Some((3, _)) =>
43+
new java.io.File(s"${srcBaseDir.getPath}-2.13+") :: Nil
4244
case _ => Nil
4345
}
4446

@@ -128,6 +130,10 @@ val sharedSettings = Seq(
128130
Compile / unmanagedSourceDirectories ++= scalaVersionSpecificJavaFolders(
129131
(Compile / javaSource).value,
130132
scalaVersion.value
133+
),
134+
Test / unmanagedSourceDirectories ++= scalaVersionSpecificJavaFolders(
135+
(Test / scalaSource).value,
136+
scalaVersion.value
131137
)
132138
) ++ mimaSettings
133139
// NOTE: After dropping Scala 2.11, we can remove src/main/scala-2.11 and share sources between scala 2.12, 2.13 and 3.x.

0 commit comments

Comments
 (0)