Skip to content

Commit

Permalink
Update sbt, scala and scalafx versions
Browse files Browse the repository at this point in the history
  • Loading branch information
vigoo committed Mar 10, 2024
1 parent 5cc7363 commit e97e318
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .bsp/sbt.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"sbt","version":"1.5.5","bspVersion":"2.0.0-M5","languages":["scala"],"argv":["C:\\Program Files\\Java\\jdk1.8.0_191\\jre/bin/java","-Xms100m","-Xmx100m","-classpath","C:/Users/danie/AppData/Local/JetBrains/Toolbox/apps/IDEA-C/ch-0/212.5080.55.plugins/Scala/launcher/sbt-launch.jar","xsbt.boot.Boot","-bsp","--sbt-launch-jar=C:/Users/danie/AppData/Local/JetBrains/Toolbox/apps/IDEA-C/ch-0/212.5080.55.plugins/Scala/launcher/sbt-launch.jar"]}
{"name":"sbt","version":"1.9.9","bspVersion":"2.1.0-M1","languages":["scala"],"argv":["/Users/vigoo/.sdkman/candidates/java/21-zulu/zulu-21.jdk/Contents/Home/bin/java","-Xms100m","-Xmx100m","-classpath","/Users/vigoo/.sdkman/candidates/sbt/1.9.6/bin/sbt-launch.jar","-Dsbt.script=/Users/vigoo/.sdkman/candidates/sbt/current/bin/sbt","xsbt.boot.Boot","-bsp"]}
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ lazy val commonSettings =
Seq(
organization := "org.scalafx",
version := "0.5",
crossScalaVersions := Seq("2.13.6", "2.12.14", "2.11.12"),
crossScalaVersions := Seq("2.13.13", "2.12.19", "2.11.12"),
scalaVersion := crossScalaVersions.value.head,
scalacOptions ++= Seq("-deprecation"),
// If using Scala 2.13 or better, enable macro processing through compiler option
Expand All @@ -37,7 +37,7 @@ lazy val commonSettings =
resolvers += Resolver.sonatypeRepo("releases"),
resolvers += Resolver.sonatypeRepo("snapshots"),
libraryDependencies ++= Seq(
"org.scalafx" %% "scalafx" % "15.0.1-R21",
"org.scalafx" %% "scalafx" % "21.0.0-R32",
"org.scalatest" %% "scalatest" % "3.2.9" % "test"),

// Add JavaFX dependencies, mark as "provided", so they can be later removed from published POM
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.5.5
sbt.version=1.9.9

0 comments on commit e97e318

Please sign in to comment.