Skip to content

Commit

Permalink
Update SBT and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jpsacha committed Jan 29, 2020
1 parent 5da3bc3 commit 8c9f789
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ project/target
.worksheet/
*.sc
.externalToolBuilders/
/_local_/
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
// JAR_BUILT_BY - Name to be added to Jar metadata field "Built-By" (defaults to System.getProperty("user.name")
//

val projectVersion = "0.3.2.2-SNAPSHOT"
val projectVersion = "0.3.2.6-SNAPSHOT"
val versionTagDir = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
val _scalaVersions = Seq("2.13.1", "2.12.10")
val _scalaVersion = _scalaVersions.head
Expand Down Expand Up @@ -89,7 +89,7 @@ lazy val scalaFXExtrasSettings = Seq(
scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8", "-feature"),
scalacOptions in(Compile, doc) ++= Opts.doc.title("ScalaFX Extras API"),
scalacOptions in(Compile, doc) ++= Opts.doc.version(projectVersion),
scalacOptions in(Compile, doc) += s"-doc-external-doc:${scalaInstance.value.libraryJar}#http://www.scala-lang.org/api/${scalaVersion.value}/",
scalacOptions in(Compile, doc) += s"-doc-external-doc:${scalaInstance.value.libraryJars.head}#http://www.scala-lang.org/api/${scalaVersion.value}/",
scalacOptions in(Compile, doc) ++= Seq("-doc-footer", s"ScalaFX Extras API v.$projectVersion"),
// If using Scala 2.13 or better, enable macro processing through compiler option
scalacOptions += (if (isScala2_13plus(scalaVersion.value)) "-Ymacro-annotations" else ""),
Expand All @@ -106,11 +106,11 @@ lazy val scalaFXExtrasSettings = Seq(
// "-source", "1.8",
"-Xlint:deprecation"),
libraryDependencies ++= Seq(
"com.beachape" %% "enumeratum" % "1.5.13",
"com.beachape" %% "enumeratum" % "1.5.15",
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
"org.scalafx" %% "scalafx" % "12.0.2-R18",
"org.scalafx" %% "scalafxml-core-sfx8" % "0.5",
"org.scalatest" %% "scalatest" % "3.0.8" % "test"
"org.scalatest" %% "scalatest" % "3.1.0" % "test"
) ++ JavaFXModuleLibs,
// Use `pomPostProcess` to remove dependencies marked as "provided" from publishing in POM
// This is to avoid dependency on wrong OS version JavaFX libraries
Expand Down
4 changes: 2 additions & 2 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011-2019, ScalaFX Project
# Copyright (c) 2011-2020, ScalaFX Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand All @@ -24,5 +24,5 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
sbt.version=1.3.0
sbt.version=1.3.7

0 comments on commit 8c9f789

Please sign in to comment.