Skip to content

Commit

Permalink
Update SBT and dependencies
Browse files Browse the repository at this point in the history
Keep Scala at 2.13.1 due to scala/bug#11955
  • Loading branch information
jpsacha committed May 1, 2020
1 parent 3499830 commit 186dfb3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}

val projectVersion = "0.3.3.1-SNAPSHOT"
val versionTagDir = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
val _scalaVersions = Seq("2.13.1", "2.12.10")
val _scalaVersions = Seq("2.13.1", "2.12.11")
val _scalaVersion = _scalaVersions.head
val _scalaFXVersion = "12.0.2"

Expand Down Expand Up @@ -115,7 +115,7 @@ lazy val scalaFXExtrasSettings = Seq(
"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.1.0" % "test"
"org.scalatest" %% "scalatest" % "3.1.1" % "test"
) ++ JavaFXModuleLibsProvided,
// 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
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
sbt.version=1.3.10

2 changes: 1 addition & 1 deletion project/sbt-sonatype.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// [https://github.com/xerial/sbt-sonatype]
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")

0 comments on commit 186dfb3

Please sign in to comment.