Skip to content

Commit

Permalink
Update sbt and compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
OndrejSpanel committed Mar 22, 2024
1 parent 698601b commit c5a402f
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
git config --add github.token ${{ secrets.GITHUB_TOKEN }}
sbt projsJS/fullOptJS
mkdir public
cp js/target/scala-2.13/formulafx-opt.js public/.
cp js/target/scala-2.13/index.html public/.
cp js/target/scala-3.3.3/formulafx-opt.js public/.
cp js/target/scala-3.3.3/index.html public/.
- name: Deploy
if: success()
uses: crazy-max/ghaction-github-pages@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-jar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ jobs:
- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
with:
file: jvm/target/scala-2.13/FormulaFX.jar
file: jvm/target/scala-3.3.3/FormulaFX.jar
tag: ${{ github.ref }}
overwrite: true
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ def generateIndexTask(index: String, suffix: String) = Def.task {
}

lazy val commonSettings = Seq(
scalaVersion := "2.13.10",
scalaVersion := "3.3.3",
version := "0.3.0",
libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.1.1",
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.0" % "test"
libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.3.0",
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.18" % "test"
)
lazy val root = project.in(file(".")).
aggregate(pJVM, pJS).
Expand All @@ -37,11 +37,11 @@ lazy val projs = crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Full)
)
.jvmSettings(
// Add JVM-specific settings here
libraryDependencies += "org.scala-lang.modules" %% "scala-swing" % "2.1.1",
libraryDependencies += "org.scala-lang.modules" %% "scala-swing" % "3.0.0",
assemblyJarName := "FormulaFX.jar"
)
.jsSettings(
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.2.0",
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.8.0",
(Compile / fastOptJS) := (Compile / fastOptJS).dependsOn(generateIndexTask("index-fast.html","fastOpt")).value,
(Compile / fullOptJS) := (Compile / fullOptJS).dependsOn(generateIndexTask("index.html","opt")).value
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ object FormulaFX extends SimpleSwingApplication {
}
case ValueChanged(`input`) =>
computeResult(true)
case ListSelectionChanged(`table`, range, live) =>
println(s"$range $live")
//case ListSelectionChanged(`table`, range, live) =>
// println(s"$range $live")
case TableRowsSelected(`table`, range, false) =>
input.text = tableData(range.head).text.trim
}
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.8.0
sbt.version = 1.9.9
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")

addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.3.1")
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ trait ExpressionTestUtils {

class ExprParserTest extends AnyFlatSpec with Matchers with TypeCheckedTripleEquals with ExpressionTestUtils {

implicit val numberEq = new Equivalence[Try[Number]] {
implicit val numberEq: Equivalence[Try[Number]] = new Equivalence[Try[Number]] {
override def areEquivalent(a: Try[Number], b: Try[Number]) = (a, b) match {
case (Failure(_), Failure(_)) => true
case (Failure(_), Success(_)) => false
Expand Down

0 comments on commit c5a402f

Please sign in to comment.