Update dependencies

jpsacha · jpsacha · commit 2a2ed1fd5df4 · 2025-04-25T13:47:54.000-04:00
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.17
+version = 3.9.4
 
 runner.dialect = scala213
 
diff --git a/cell_factories/build.sbt b/cell_factories/build.sbt
@@ -2,12 +2,12 @@ name         := "Cell Factories"
 organization := "scalafx.org"
 version      := "1.0.0"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
 // Add dependency on ScalaFX library
-libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
+libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.0-R35"
 
 resolvers ++= Opts.resolver.sonatypeOssSnapshots
 
diff --git a/cell_factories/project/build.properties b/cell_factories/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
 
diff --git a/cell_factories/src/main/scala/cell_factories/ColorCharactersInTableView.scala b/cell_factories/src/main/scala/cell_factories/ColorCharactersInTableView.scala
@@ -21,7 +21,7 @@ object ColorCharactersInTableView extends JFXApp3 {
     new Person("Peggy", "Sue"),
     new Person("Rocky", "Raccoon"),
     new Person("Bill", "Bungalow")
-    )
+  )
 
   /** Render string as colored text */
   def createColorText(name: String): Node = {
@@ -30,7 +30,7 @@ object ColorCharactersInTableView extends JFXApp3 {
         case 'r' => Color.Red
         case 'g' => Color.Green
         case 'b' => Color.Blue
-        case _ => Color.Black
+        case _   => Color.Black
       }
       new Text {
         text = char.toString
@@ -57,17 +57,18 @@ object ColorCharactersInTableView extends JFXApp3 {
   }
 
   override def start(): Unit = {
+    val tableView = new TableView[Person]() {
+      columns ++= Seq(firstNameColumn, lastNameColumn)
+    }
     stage = new JFXApp3.PrimaryStage {
       title = "Table View with Color Text - ScalaFX way"
       scene = new Scene {
         root = new VBox {
-          children = Seq(
-            new TableView[Person](characters) {
-              columns ++= Seq(firstNameColumn, lastNameColumn)
-            }
-            )
+          children = Seq(tableView)
         }
       }
     }
+
+    tableView.items = characters
   }
 }
diff --git a/event-filters/build.sbt b/event-filters/build.sbt
@@ -2,11 +2,11 @@ name         := "Event Filters"
 organization := "scalafx.org"
 version      := "1.0.8"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
-libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
+libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.0-R35"
 
 resolvers ++= Opts.resolver.sonatypeOssSnapshots
 
diff --git a/event-filters/project/build.properties b/event-filters/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/hello-sbt/build.sbt b/hello-sbt/build.sbt
@@ -5,12 +5,12 @@ name := "Hello SBT"
 version := "1.0.7"
 
 // Version of Scala used by the project
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
 // Add dependency on ScalaFX library
-libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
+libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.0-R35"
 
 resolvers ++= Opts.resolver.sonatypeOssSnapshots
 
diff --git a/hello-sbt/project/build.properties b/hello-sbt/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/molecule-3d/build.sbt b/molecule-3d/build.sbt
@@ -2,13 +2,13 @@ name         := "Molecule 3D"
 organization := "scalafx.org"
 version      := "0.2.6"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 resolvers += Resolver.sonatypeRepo("snapshots")
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
-libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
+libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.0-R35"
 
 // Fork a new JVM for 'run' and 'test:run', to avoid JavaFX double initialization problems
 fork := true
diff --git a/molecule-3d/project/build.properties b/molecule-3d/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/properties/build.sbt b/properties/build.sbt
@@ -2,11 +2,11 @@ name         := "Properties"
 organization := "scalafx.org"
 version      := "0.3"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
-libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
+libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.0-R35"
 
 resolvers ++= Opts.resolver.sonatypeOssSnapshots
 
diff --git a/properties/project/build.properties b/properties/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/sam_event_handlers/build.sbt b/sam_event_handlers/build.sbt
@@ -2,11 +2,11 @@ name         := "SAM Event Handlers"
 organization := "ScalaFX.org"
 version      := "0.1.3"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
-libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
+libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.0-R35"
 
 resolvers ++= Opts.resolver.sonatypeOssSnapshots
 
diff --git a/sam_event_handlers/project/build.properties b/sam_event_handlers/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/scalafxml-example/build.sbt b/scalafxml-example/build.sbt
@@ -2,13 +2,13 @@ name := "ScalaFXML Example"
 organization := "scalafx.org"
 version := "1.0.7"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8", "-Ymacro-annotations")
 
 Compile / resourceDirectory := (Compile / scalaSource).value
 libraryDependencies ++= Seq(
-  "org.scalafx" %% "scalafx" % "21.0.0-R32",
+  "org.scalafx" %% "scalafx" % "24.0.0-R35",
   "org.scalafx" %% "scalafxml-core-sfx8" % "0.5"
   )
 
diff --git a/scalafxml-example/project/build.properties b/scalafxml-example/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/slick-table/build.sbt b/slick-table/build.sbt
@@ -2,15 +2,15 @@ name         := "Slick Table"
 organization := "org.scalafx"
 version      := "0.3"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
 libraryDependencies ++= Seq(
-  "org.scalafx"        %% "scalafx"   % "21.0.0-R32",
-  "com.typesafe.slick" %% "slick"     % "3.4.1",
-  "org.slf4j"           % "slf4j-nop" % "2.0.7",
-  "com.h2database"      % "h2"        % "2.1.214"
+  "org.scalafx"        %% "scalafx"   % "24.0.0-R35",
+  "com.typesafe.slick" %% "slick"     % "3.6.0",
+  "org.slf4j"           % "slf4j-nop" % "2.0.17",
+  "com.h2database"      % "h2"        % "2.3.232"
   )
 
 resolvers ++= Opts.resolver.sonatypeOssSnapshots
diff --git a/slick-table/project/build.properties b/slick-table/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/splash-demo/build.sbt b/splash-demo/build.sbt
@@ -4,11 +4,11 @@ organization := "org.scalafx"
 
 version := "0.2.2"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
-libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
+libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.0-R35"
 
 resolvers ++= Opts.resolver.sonatypeOssSnapshots
 
diff --git a/splash-demo/project/build.properties b/splash-demo/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/spreadsheetview/build.sbt b/spreadsheetview/build.sbt
@@ -1,8 +1,8 @@
 name         := "SpreadsheetView"
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
-libraryDependencies += "org.scalafx"   %% "scalafx"    % "21.0.0-R32"
-libraryDependencies += "org.controlsfx" % "controlsfx" % "11.1.2"
+libraryDependencies += "org.scalafx"   %% "scalafx"    % "24.0.0-R35"
+libraryDependencies += "org.controlsfx" % "controlsfx" % "11.2.2"
 
 resolvers += Resolver.mavenLocal
 
diff --git a/spreadsheetview/project/build.properties b/spreadsheetview/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11
diff --git a/stand-alone-dialog/build.sbt b/stand-alone-dialog/build.sbt
@@ -2,11 +2,11 @@ name         := "Stand-Alone Dialog"
 organization := "scalafx.org"
 version      := "1.0.8"
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.16"
 
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
-libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
+libraryDependencies += "org.scalafx" %% "scalafx" % "24.0.0-R35"
 
 resolvers ++= Opts.resolver.sonatypeOssSnapshots
 
diff --git a/stand-alone-dialog/project/build.properties b/stand-alone-dialog/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.10.11

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = 3.7.17`
	`1`	`+version = 3.9.4`
`2`	`2`
`3`	`3`	`runner.dialect = scala213`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-sbt.version=1.9.7`
	`1`	`+sbt.version=1.10.11`
`2`	`2`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ object ColorCharactersInTableView extends JFXApp3 {`
`21`	`21`	`new Person("Peggy", "Sue"),`
`22`	`22`	`new Person("Rocky", "Raccoon"),`
`23`	`23`	`new Person("Bill", "Bungalow")`
`24`		`- )`
	`24`	`+ )`
`25`	`25`
`26`	`26`	`/** Render string as colored text */`
`27`	`27`	`def createColorText(name: String): Node = {`
`@@ -30,7 +30,7 @@ object ColorCharactersInTableView extends JFXApp3 {`
`30`	`30`	`case 'r' => Color.Red`
`31`	`31`	`case 'g' => Color.Green`
`32`	`32`	`case 'b' => Color.Blue`
`33`		`- case _ => Color.Black`
	`33`	`+ case _ => Color.Black`
`34`	`34`	`}`
`35`	`35`	`new Text {`
`36`	`36`	`text = char.toString`
`@@ -57,17 +57,18 @@ object ColorCharactersInTableView extends JFXApp3 {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`override def start(): Unit = {`
	`60`	`+ val tableView = new TableView[Person]() {`
	`61`	`+ columns ++= Seq(firstNameColumn, lastNameColumn)`
	`62`	`+ }`
`60`	`63`	`stage = new JFXApp3.PrimaryStage {`
`61`	`64`	`title = "Table View with Color Text - ScalaFX way"`
`62`	`65`	`scene = new Scene {`
`63`	`66`	`root = new VBox {`
`64`		`- children = Seq(`
`65`		`- new TableView[Person](characters) {`
`66`		`- columns ++= Seq(firstNameColumn, lastNameColumn)`
`67`		`- }`
`68`		`- )`
	`67`	`+ children = Seq(tableView)`
`69`	`68`	`}`
`70`	`69`	`}`
`71`	`70`	`}`
	`71`	`+`
	`72`	`+ tableView.items = characters`
`72`	`73`	`}`
`73`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.9.7`
	`1`	`+sbt.version=1.10.11`