Skip to content

Commit

Permalink
Merge pull request #59 from mliarakos/master
Browse files Browse the repository at this point in the history
updated to latest minor versions of sbt, scala, scalajs and other dependencies
  • Loading branch information
julienrf authored Aug 1, 2018
2 parents 9ba385f + 7790b66 commit 13e8519
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
15 changes: 9 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
scalaVersion in ThisBuild := "2.12.2"
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.11.11")
scalaVersion in ThisBuild := "2.12.6"

crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.11.12")

val library =
crossProject.crossType(CrossType.Pure)
crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Pure)
.enablePlugins(GitVersioning)
.settings(
organization := "org.julienrf",
name := "play-json-derived-codecs",
libraryDependencies ++= Seq(
"com.chuusai" %%% "shapeless" % "2.3.2",
"org.scalatest" %%% "scalatest" % "3.0.3" % Test,
"com.chuusai" %%% "shapeless" % "2.3.3",
"org.scalatest" %%% "scalatest" % "3.0.5" % Test,
"org.scalacheck" %%% "scalacheck" % "1.13.5" % Test,
"com.typesafe.play" %%% "play-json" % "2.6.1"
"com.typesafe.play" %%% "play-json" % "2.6.9"
),
publishTo := {
val nexus = "https://oss.sonatype.org"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=0.13.17
8 changes: 5 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.4")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")

0 comments on commit 13e8519

Please sign in to comment.