Updated to Scala 3.4 and MUnit 1.0

build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "3.3.1"
+scalaVersion := "3.4.2"
 
 name := "TriPaint"
 organization := "com.martomate"
@@ -28,7 +28,7 @@ jlinkOptions ++= Seq(
 Compile / scalacOptions += "-deprecation"
 
 libraryDependencies ++= Seq(
-  "org.scalameta" %% "munit" % "0.7.29" % "test",
+  "org.scalameta" %% "munit" % "1.0.0" % "test",
   "org.scalatestplus" %% "mockito-4-5" % "3.2.12.0" % "test"
 )
 

src/main/scala/tripaint/model/coords/GlobalPixCoords.scala

@@ -2,7 +2,7 @@ package tripaint.model.coords
 
 /** Like TriImageCoords but for pixels (on the entire area) */
 case class GlobalPixCoords(x: Int, y: Int) {
-  def distanceSq(other: GlobalPixCoords): Double = {
+  infix def distanceSq(other: GlobalPixCoords): Double = {
     val dx = other.x - x
     val dy = other.y - y
     val otherY = other.y + (if other.x % 2 == 0 then 1.0 / 3 else 2.0 / 3)

src/main/scala/tripaint/model/image/GridCell.scala

@@ -17,7 +17,7 @@ class GridCell(val coords: GridCoords, init_image: ImageStorage):
   private val dispatcher = new EventDispatcher[GridCell.Event]
   def trackChanges(tracker: Tracker[GridCell.Event]): Tracker.RevokeFn = dispatcher.track(tracker)
 
-  _image.trackChanges(this.onStorageChanged _)
+  _image.trackChanges(this.onStorageChanged(_))
 
   def storage: ImageStorage = _image
 
@@ -35,7 +35,7 @@ class GridCell(val coords: GridCoords, init_image: ImageStorage):
 
   def replaceImage(newImage: ImageStorage): Unit =
     _image = newImage
-    _image.trackChanges(this.onStorageChanged _)
+    _image.trackChanges(this.onStorageChanged(_))
     dispatcher.notify(GridCell.Event.ImageChangedALot)
 
   private def onStorageChanged(event: ImageStorage.Event): Unit =

src/main/scala/tripaint/view/gui/AskForFileOpenSettingsDialog.scala

@@ -39,7 +39,7 @@ object AskForFileOpenSettingsDialog {
     val formatMap: Map[StorageFormat, String] = Map.from(formats)
 
     val formatChooser = {
-      val b = new ChoiceBox[StorageFormat](ObservableBuffer(formats.map(_._1): _*))
+      val b = new ChoiceBox[StorageFormat](ObservableBuffer(formats.map(_._1)*))
       b.selectionModel.value.select(initiallySelectedFormat)
       b.converter = StringConverter.toStringConverter(formatMap(_))
       b

src/main/scala/tripaint/view/gui/AskForFileSaveSettingsDialog.scala

@@ -35,7 +35,7 @@ object AskForFileSaveSettingsDialog {
     val formatMap: Map[StorageFormat, String] = Map.from(formats)
 
     val formatChooser = {
-      val b = new ChoiceBox[StorageFormat](ObservableBuffer(formats.map(_._1): _*))
+      val b = new ChoiceBox[StorageFormat](ObservableBuffer(formats.map(_._1)*))
       b.selectionModel.value.select(initiallySelectedFormat)
       b.converter = StringConverter.toStringConverter(formatMap(_))
       b

src/main/scala/tripaint/view/gui/DialogUtils.scala

@@ -72,7 +72,7 @@ object DialogUtils {
     dialog.contentText = contentText
     dialog.graphic = graphic
 
-    val contentBox = new VBox(content: _*)
+    val contentBox = new VBox(content*)
     contentBox.setSpacing(10)
 
     dialog.dialogPane().setContent(contentBox)

src/main/scala/tripaint/view/gui/ImagePreviewList.scala

@@ -38,13 +38,13 @@ object ImagePreviewList {
     val scrollPane = {
       val p = new ScrollPane()
       p.maxWidth = previewSize * 5
-      p.content = new HBox(children = makeContent(_ => ()): _*)
+      p.content = new HBox(children = makeContent(_ => ())*)
       p.minViewportHeight = previewSize * Math.sqrt(3) / 2
       p
     }
 
     val updatePreview: (ImageGrid => Unit) => Unit = effect => {
-      scrollPane.content = new HBox(children = makeContent(effect): _*)
+      scrollPane.content = new HBox(children = makeContent(effect)*)
     }
 
     (scrollPane, updatePreview)

src/main/scala/tripaint/view/gui/ImageTabs.scala

@@ -36,7 +36,7 @@ object ImageTabs {
       requestImageRemoval: GridCell => Unit
   ): TilePane = {
     val tilePane = new ImageTabs(imagePool, requestImageRemoval)
-    imageGrid.trackChanges(tilePane.onImageGridEvent _)
+    imageGrid.trackChanges(tilePane.onImageGridEvent(_))
     tilePane
   }
 }

src/main/scala/tripaint/view/gui/MainStageButtons.scala

@@ -33,7 +33,7 @@ object MainStageButtons {
     "Save As",
     accelerator =
       new KeyCodeCombination(KeyCode.S, KeyCombination.ControlDown, KeyCombination.ShiftDown),
-    UIAction.SaveAs
+    action = UIAction.SaveAs
   )
   val Exit: MenuBarAction = MenuBarAction("Exit", action = UIAction.Exit)
   val Undo: MenuBarAction = MenuBarAction(

src/main/scala/tripaint/view/image/ImageGridPane.scala

@@ -54,7 +54,7 @@ class ImageGridPane(imageGrid: ImageGrid) extends Pane {
 
   children.add(canvas)
 
-  imageGrid.trackChanges(this.onImageGridEvent _)
+  imageGrid.trackChanges(this.onImageGridEvent(_))
 
   private val cumulativeImageChange = mutable.Map.empty[GridCoords, ImageChange.Builder]
 

src/main/scala/tripaint/view/image/TriImageForPreview.scala

@@ -12,7 +12,7 @@ class TriImageForPreview(content: GridCell, previewWidth: Double) extends Pane {
 
   private val canvas: TriImageCanvas = new TriImageCanvas(previewWidth, storage.imageSize)
 
-  content.trackChanges(onImageChanged _)
+  content.trackChanges(onImageChanged(_))
   children.add(canvas)
 
   redraw()