@@ -14,7 +14,6 @@ val projectVersion = "0.6.0.1-SNAPSHOT"
1414val versionTagDir = if (projectVersion.endsWith(" SNAPSHOT" )) " master" else " v." + projectVersion
1515val _scalaVersions = Seq (" 3.0.2" , " 2.13.8" , " 2.12.16" )
1616val _scalaVersion = _scalaVersions.head
17- val _javaFXVersion = " 18.0.1"
1817
1918ThisBuild / version := projectVersion
2019ThisBuild / crossScalaVersions := _scalaVersions
@@ -24,10 +23,6 @@ ThisBuild / organization := "org.scalafx"
2423publishArtifact := false
2524publish / skip := true
2625
27- lazy val JavaFXModuleLibs : Seq [ModuleID ] =
28- Seq (" base" , " controls" , " fxml" , " graphics" , " media" , " swing" , " web" )
29- .map(m => " org.openjfx" % s " javafx- $m" % _javaFXVersion)
30-
3126def isScala2 (scalaVersion : String ): Boolean = {
3227 CrossVersion .partialVersion(scalaVersion) match {
3328 case Some ((2 , _)) => true
@@ -80,7 +75,6 @@ lazy val scalaFXExtrasDemos = (project in file("scalafx-extras-demos")).settings
8075 " -Xmx512M" ,
8176 " -Djavafx.verbose"
8277 ),
83- libraryDependencies ++= JavaFXModuleLibs ,
8478 publishArtifact := false ,
8579 libraryDependencies ++= Seq (
8680 " com.typesafe.scala-logging" %% " scala-logging" % " 3.9.4" ,
@@ -154,9 +148,9 @@ lazy val scalaFXExtrasSettings = Seq(
154148 Seq .empty[sbt.ModuleID ]
155149 ),
156150 libraryDependencies ++= Seq (
157- " org.scalafx" %% " scalafx" % " 18.0.1-R27 " ,
151+ " org.scalafx" %% " scalafx" % " 18.0.2-R29 " ,
158152 " org.scalatest" %% " scalatest" % " 3.2.11" % " test"
159- ) ++ JavaFXModuleLibs ,
153+ ),
160154 libraryDependencies ++= (
161155 if (isScala2(scalaVersion.value))
162156 Seq (
0 commit comments