Skip to content

Commit 186dfb3

Browse files
committed
Update SBT and dependencies
Keep Scala at 2.13.1 due to scala/bug#11955
1 parent 3499830 commit 186dfb3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
1313

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

@@ -115,7 +115,7 @@ lazy val scalaFXExtrasSettings = Seq(
115115
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
116116
"org.scalafx" %% "scalafx" % "12.0.2-R18",
117117
"org.scalafx" %% "scalafxml-core-sfx8" % "0.5",
118-
"org.scalatest" %% "scalatest" % "3.1.0" % "test"
118+
"org.scalatest" %% "scalatest" % "3.1.1" % "test"
119119
) ++ JavaFXModuleLibsProvided,
120120
// Use `pomPostProcess` to remove dependencies marked as "provided" from publishing in POM
121121
// This is to avoid dependency on wrong OS version JavaFX libraries

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2525
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626
#
27-
sbt.version=1.3.8
27+
sbt.version=1.3.10
2828

project/sbt-sonatype.sbt

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

0 commit comments

Comments
 (0)