Skip to content

Commit 98a8769

Browse files
committed
Bump ScalaFX to 21.0.0-R32
1 parent 3009060 commit 98a8769

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
name := "ScalaFX Ensemble"
44

5-
version := "20.0.0-R31"
5+
version := "21.0.0-R32"
66

77
organization := "org.scalafx"
88

9-
val scala2Version = "2.13.10"
10-
val scala3Version = "3.2.2"
9+
val scala2Version = "2.13.12"
10+
val scala3Version = "3.3.1"
1111
// To cross compile with Scala 2 and Scala 3
1212
crossScalaVersions := Seq(scala2Version, scala3Version)
1313
scalaVersion := scala2Version
1414

1515
libraryDependencies ++= Seq(
16-
"org.scalafx" %% "scalafx" % "20.0.0-R31",
17-
"org.scalatest" %% "scalatest" % "3.2.15"
16+
"org.scalafx" %% "scalafx" % "21.0.0-R32",
17+
"org.scalatest" %% "scalatest" % "3.2.17"
1818
)
1919

2020
resolvers ++= Resolver.sonatypeOssRepos("snapshots")
@@ -23,7 +23,7 @@ scalacOptions ++= Seq("-unchecked", "-deprecation")
2323
scalacOptions ++= (
2424
CrossVersion.partialVersion(scalaVersion.value) match {
2525
case Some((3, _)) =>
26-
Seq("-explain", "-explain-types", "-rewrite", "-source", "3.2-migration")
26+
Seq("-explain", "-explain-types", "-rewrite", "-source", "3.3-migration")
2727
case _ =>
2828
Seq("-Xlint", "-explaintypes")
2929
}

src/main/resources/scalafx/ensemble/sbt/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ This example can be compiled and run using the [Simple Build Tool](http://www.sc
1414
Requirements
1515
------------
1616

17-
To compile and run the project you only need to have
18-
[Java 11](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
19-
(version 11 or newer) and [SBT](http://www.scala-sbt.org/) (v.1.3 or newer) installed.
17+
To compile and run the project, you only need to have
18+
[Java 17](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
19+
(version 17 or newer) and [SBT](http://www.scala-sbt.org/) (v.1.9 or newer) installed.
2020
All missing dependencies, including proper version of Scala and ScalaFX, will be downloaded by SBT.
2121

2222

src/main/resources/scalafx/ensemble/sbt/build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name := "@name@"
22

3-
version := "1.21"
3+
version := "1.22"
44

5-
scalaVersion := "3.2.2"
5+
scalaVersion := "3.3.1"
66

7-
libraryDependencies += "org.scalafx" %% "scalafx" % "20.0.0-R31"
7+
libraryDependencies += "org.scalafx" %% "scalafx" % "21.0.0-R32"
88

99
Compile / mainClass := Some("@mainClass@")
1010

0 commit comments

Comments
 (0)