Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
chandu0101 committed Dec 28, 2017
1 parent 70d1e51 commit 8bbde42
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: scala

scala:
- 2.12.2
- 2.11.11
- 2.12.4

jdk:
- oraclejdk8
Expand Down
13 changes: 6 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ name := "platform-config-android"

enablePlugins(ScalaJSPlugin)

val scala211 = "2.11.11"
val scala212 = "2.12.4"

val scala212 = "2.12.2"
scalaVersion := scala212

scalaVersion := scala211

crossScalaVersions := Seq(scala211, scala212)
crossScalaVersions := Seq(scala212)

scalacOptions ++= Seq(
"-feature",
Expand All @@ -19,11 +17,12 @@ scalacOptions ++= Seq(
"-language:implicitConversions"
)

libraryDependencies += "scalajs-react-interface" %%% "universal" % "2017.7.9-RC" % Provided
libraryDependencies += "scalajs-react-interface" %%% "universal" % "2017.12.28-RC" % Provided

//bintray
resolvers += Resolver.jcenterRepo
resolvers += Resolver.bintrayRepo("scalajs-react-interface", "maven")
resolvers ++= Seq(Resolver.bintrayRepo("scalajs-react-interface", "maven"),
Resolver.bintrayRepo("scalajs-plus", "maven"))

organization := "scalajs-react-interface"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=0.13.15
sbt.version=1.0.4

8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "1.3.0")
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M2")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.2")

0 comments on commit 8bbde42

Please sign in to comment.