Skip to content

Commit 13e8519

Browse files
authored
Merge pull request #59 from mliarakos/master
updated to latest minor versions of sbt, scala, scalajs and other dependencies
2 parents 9ba385f + 7790b66 commit 13e8519

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

build.sbt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
scalaVersion in ThisBuild := "2.12.2"
1+
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
22

3-
crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.11.11")
3+
scalaVersion in ThisBuild := "2.12.6"
4+
5+
crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.11.12")
46

57
val library =
6-
crossProject.crossType(CrossType.Pure)
8+
crossProject(JSPlatform, JVMPlatform)
9+
.crossType(CrossType.Pure)
710
.enablePlugins(GitVersioning)
811
.settings(
912
organization := "org.julienrf",
1013
name := "play-json-derived-codecs",
1114
libraryDependencies ++= Seq(
12-
"com.chuusai" %%% "shapeless" % "2.3.2",
13-
"org.scalatest" %%% "scalatest" % "3.0.3" % Test,
15+
"com.chuusai" %%% "shapeless" % "2.3.3",
16+
"org.scalatest" %%% "scalatest" % "3.0.5" % Test,
1417
"org.scalacheck" %%% "scalacheck" % "1.13.5" % Test,
15-
"com.typesafe.play" %%% "play-json" % "2.6.1"
18+
"com.typesafe.play" %%% "play-json" % "2.6.9"
1619
),
1720
publishTo := {
1821
val nexus = "https://oss.sonatype.org"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=0.13.17

project/plugins.sbt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
1+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
22

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

5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
5+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
6+
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")

0 commit comments

Comments
 (0)