diff --git a/build.mill b/build.mill index 0949263..e57b642 100644 --- a/build.mill +++ b/build.mill @@ -19,7 +19,7 @@ import mill.api.Result import com.goyeau.mill.scalafix.ScalafixModule trait Common extends ScalaModule with PublishModule with ScalafixModule { - def scalaVersion = "3.5.2" + def scalaVersion = "3.6.2-RC2" def publishVersion = VcsVersion.vcsState().format() @@ -191,10 +191,10 @@ object jsSite extends SiteJSModule { } } -object integration extends ScalaModule with CommonTests { - def scalaVersion: T[String] = vecxt.jvm.scalaVersion +// object integration extends ScalaModule with CommonTests { +// def scalaVersion: T[String] = vecxt.jvm.scalaVersion -} +// } // note that scastic won't work, as I don't think we can start a JVM with the incubator flag. object site extends SiteModule { diff --git a/jsSite/src/PlotElements.scala b/jsSite/src/PlotElements.scala index 08b8fbd..00e0894 100644 --- a/jsSite/src/PlotElements.scala +++ b/jsSite/src/PlotElements.scala @@ -1,6 +1,6 @@ package vecxt.plot -import scala.NamedTuple.AnyNamedTuple +import scala.NamedTuple.* import scala.annotation.meta.field import upickle.default.* import NamedTupleReadWriter.given diff --git a/vecxt/jvm/src/arrays.scala b/vecxt/jvm/src/arrays.scala index d488414..f95cb7f 100644 --- a/vecxt/jvm/src/arrays.scala +++ b/vecxt/jvm/src/arrays.scala @@ -24,7 +24,6 @@ import jdk.incubator.vector.ByteVector import jdk.incubator.vector.DoubleVector import jdk.incubator.vector.VectorOperators import jdk.incubator.vector.IntVector -import scala.util.control.Breaks.* object arrays: diff --git a/vecxt/jvm/src/doublematrix.scala b/vecxt/jvm/src/doublematrix.scala index 03c6e58..6af58c3 100644 --- a/vecxt/jvm/src/doublematrix.scala +++ b/vecxt/jvm/src/doublematrix.scala @@ -6,7 +6,6 @@ import vecxt.BoundsCheck.BoundsCheck import vecxt.DoubleArrays.* import vecxt.MatrixInstance.* import vecxt.matrix.* -import vecxt.arrays.* import dev.ludovic.netlib.blas.JavaBLAS.getInstance as blas @@ -40,7 +39,7 @@ object JvmDoubleMatrix: // inline def *:*=(d: Double): Unit = m.raw.multInPlace(d) inline def >=(d: Double): Matrix[Boolean] = - Matrix[Boolean](m.raw gte d, m.shape)(using BoundsCheck.DoBoundsCheck.no) + Matrix[Boolean](m.raw.gte(d), m.shape)(using BoundsCheck.DoBoundsCheck.no) inline def >(d: Double): Matrix[Boolean] = Matrix[Boolean](m.raw.gt(d), m.shape)(using BoundsCheck.DoBoundsCheck.no) diff --git a/vecxt/src/doublearray.scala b/vecxt/src/doublearray.scala index 3caf4d9..8400056 100644 --- a/vecxt/src/doublearray.scala +++ b/vecxt/src/doublearray.scala @@ -1,7 +1,6 @@ package vecxt import narr.* - import vecxt.JsNativeDoubleArrays.* import arrays.*