Skip to content

Commit

Permalink
Bump ScalaFX to 21.0.0-R32
Browse files Browse the repository at this point in the history
  • Loading branch information
jpsacha committed Nov 17, 2023
1 parent 3009060 commit 98a8769
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/scalafx/ensemble/sbt/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/scalafx/ensemble/sbt/build.sbt
Original file line number Diff line number Diff line change
@@ -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@")

Expand Down

0 comments on commit 98a8769

Please sign in to comment.