Skip to content

Commit

Permalink
Merge pull request #17 from sparsetech/feat/deps-sbt
Browse files Browse the repository at this point in the history
Update dependencies of sbt build
  • Loading branch information
tindzk authored Oct 11, 2019
2 parents d0d988d + b5a3931 commit 55f756b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ project/plugins/project/
# Scala-IDE specific
.scala_dependencies
.worksheet
.idea

.bloop
/.idea/
/.metals/
.bloop/
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

val Scala2_11 = "2.11.12"
val Scala2_12 = "2.12.8"
val Scala2_13 = "2.13.0"
val Scala2_12 = "2.12.10"
val Scala2_13 = "2.13.1"
val FastParse = "1.0.1"
val Shapeless = "2.3.3"
val ScalaCheck = "1.14.0"
val ScalaCheck = "1.14.2"
val ScalaTest = "3.0.8"
val ScalaTestNative = "3.2.0-SNAP10"

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ logLevel := Level.Warn

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.9")
7 changes: 6 additions & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
version in ThisBuild := "0.2.2-SNAPSHOT"
version in ThisBuild := {
import sys.process._
val version = Seq("git", "describe", "--tags").!!.trim.tail
println("[info] Setting version to: " + version)
version
}

0 comments on commit 55f756b

Please sign in to comment.