From 186dfb3c7f13dff789681b4af32f57da21cff29f Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Fri, 1 May 2020 10:23:05 -0400 Subject: [PATCH] Update SBT and dependencies Keep Scala at 2.13.1 due to https://github.com/scala/bug/issues/11955 --- build.sbt | 4 ++-- project/build.properties | 2 +- project/sbt-sonatype.sbt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index d617771..ccc1c7a 100644 --- a/build.sbt +++ b/build.sbt @@ -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" @@ -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 diff --git a/project/build.properties b/project/build.properties index 3e80abd..8812817 100644 --- a/project/build.properties +++ b/project/build.properties @@ -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 diff --git a/project/sbt-sonatype.sbt b/project/sbt-sonatype.sbt index 8b2790f..a8ad240 100644 --- a/project/sbt-sonatype.sbt +++ b/project/sbt-sonatype.sbt @@ -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") \ No newline at end of file