From 98a876980a6443aa1b9feabdeb7710bde54298a1 Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Fri, 17 Nov 2023 18:46:09 -0500 Subject: [PATCH] Bump ScalaFX to 21.0.0-R32 --- build.sbt | 12 ++++++------ src/main/resources/scalafx/ensemble/sbt/README.md | 6 +++--- src/main/resources/scalafx/ensemble/sbt/build.sbt | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.sbt b/build.sbt index 0c02a63..b66b348 100644 --- a/build.sbt +++ b/build.sbt @@ -2,19 +2,19 @@ name := "ScalaFX Ensemble" -version := "20.0.0-R31" +version := "21.0.0-R32" organization := "org.scalafx" -val scala2Version = "2.13.10" -val scala3Version = "3.2.2" +val scala2Version = "2.13.12" +val scala3Version = "3.3.1" // To cross compile with Scala 2 and Scala 3 crossScalaVersions := Seq(scala2Version, scala3Version) scalaVersion := scala2Version libraryDependencies ++= Seq( - "org.scalafx" %% "scalafx" % "20.0.0-R31", - "org.scalatest" %% "scalatest" % "3.2.15" + "org.scalafx" %% "scalafx" % "21.0.0-R32", + "org.scalatest" %% "scalatest" % "3.2.17" ) resolvers ++= Resolver.sonatypeOssRepos("snapshots") @@ -23,7 +23,7 @@ scalacOptions ++= Seq("-unchecked", "-deprecation") scalacOptions ++= ( CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => - Seq("-explain", "-explain-types", "-rewrite", "-source", "3.2-migration") + Seq("-explain", "-explain-types", "-rewrite", "-source", "3.3-migration") case _ => Seq("-Xlint", "-explaintypes") } diff --git a/src/main/resources/scalafx/ensemble/sbt/README.md b/src/main/resources/scalafx/ensemble/sbt/README.md index 64870a0..004f8bb 100644 --- a/src/main/resources/scalafx/ensemble/sbt/README.md +++ b/src/main/resources/scalafx/ensemble/sbt/README.md @@ -14,9 +14,9 @@ This example can be compiled and run using the [Simple Build Tool](http://www.sc Requirements ------------ -To compile and run the project you only need to have -[Java 11](http://www.oracle.com/technetwork/java/javase/downloads/index.html) -(version 11 or newer) and [SBT](http://www.scala-sbt.org/) (v.1.3 or newer) installed. +To compile and run the project, you only need to have +[Java 17](http://www.oracle.com/technetwork/java/javase/downloads/index.html) +(version 17 or newer) and [SBT](http://www.scala-sbt.org/) (v.1.9 or newer) installed. All missing dependencies, including proper version of Scala and ScalaFX, will be downloaded by SBT. diff --git a/src/main/resources/scalafx/ensemble/sbt/build.sbt b/src/main/resources/scalafx/ensemble/sbt/build.sbt index 8b2350c..7701063 100644 --- a/src/main/resources/scalafx/ensemble/sbt/build.sbt +++ b/src/main/resources/scalafx/ensemble/sbt/build.sbt @@ -1,10 +1,10 @@ name := "@name@" -version := "1.21" +version := "1.22" -scalaVersion := "3.2.2" +scalaVersion := "3.3.1" -libraryDependencies += "org.scalafx" %% "scalafx" % "20.0.0-R31" +libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32" Compile / mainClass := Some("@mainClass@")