Skip to content

Commit

Permalink
Upgraded scala version.
Browse files Browse the repository at this point in the history
Resolved scala-steward commit conflicts.
Addressed some warnings.
  • Loading branch information
c committed Dec 9, 2024
1 parent 07f6e58 commit 2bdd1da
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import laika.helium.Helium
import laika.helium.config.{HeliumIcon, IconLink}

val appVersion:String = "0.106"
val globalScalaVersion = "3.3.1"
val globalScalaVersion = "3.3.4"

ThisBuild / organization := "ai.dragonfly"
ThisBuild / organizationName := "dragonfly.ai"
Expand Down
10 changes: 5 additions & 5 deletions narr/js/src/main/scala/narr/native/Extensions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ object Extensions {
inline def sizeCompare(otherSize: Int): Int = Integer.compare(a.length, otherSize)

/** Compares the length of this NArray to a test value. *
* @p m len the test value that gets compared with the le h.
* @ret n A value `x` re
* @param len the test value that gets compared with the le h.
* @return A value `x` re
* {{{
* x < 0 if this.length < len
* x == 0 if this.length == len
Expand Down Expand Up @@ -281,7 +281,7 @@ object Extensions {
/**
* @return an iterator for this AT
*/
inline def iterator: Iterator[T] = new scala.collection.AbstractIterator[T] {
def iterator: Iterator[T] = new scala.collection.AbstractIterator[T] {
var i: Int = -1
override val knownSize: Int = a.length
val end: Int = knownSize - 1
Expand Down Expand Up @@ -313,7 +313,7 @@ object Extensions {
*
* @return an iterator yielding the elements of this array in reversed order
*/
inline def reverseIterator: Iterator[T] = new scala.collection.AbstractIterator[T] {
def reverseIterator: Iterator[T] = new scala.collection.AbstractIterator[T] {
private[this] var i: Int = a.length
override val knownSize: Int = a.length
val end: Int = 0
Expand Down Expand Up @@ -573,7 +573,7 @@ object Extensions {
if (a(i) == elem) return true
i += 1
}
return false
false
}

/** Apply `f` to each element for
Expand Down
2 changes: 1 addition & 1 deletion narr/js/src/main/scala/narr/native/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package narr

import scala.scalajs.js.typedarray.*
import narr.native.Extensions.*
//import narr.native.Extensions.*
import narr.native.Extensions.given

import scala.language.implicitConversions
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
val crossVer = "1.3.2"
val scalaJSVersion = "1.17.0"
val scalaNativeVersion = "0.4.16"
val scalaNativeVersion = "0.4.17"

addDependencyTreePlugin

Expand All @@ -13,7 +13,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % crossVer)

// continuous integration
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.5")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7")

// Make me a website!
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.5")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.7")

0 comments on commit 2bdd1da

Please sign in to comment.