update

.travis.yml

@@ -1,8 +1,7 @@
 language: scala
 
 scala:
-- 2.12.2
-- 2.11.11
+- 2.12.4
 
 jdk:
 - oraclejdk8

build.sbt

@@ -1,16 +1,15 @@
 name := "relay"
 
-//version := "2017.7.0-SNAPSHOT"
+//version := "2017.12.0-SNAPSHOT"
 
 enablePlugins(ScalaJSPlugin)
 
-val scala211 = "2.11.11"
 
-val scala212 = "2.12.2"
+val scala212 = "2.12.4"
 
-scalaVersion := scala211
+scalaVersion := scala212
 
-crossScalaVersions := Seq(scala211, scala212)
+crossScalaVersions := Seq(scala212)
 
 scalacOptions ++= Seq(
   "-feature",
@@ -21,8 +20,8 @@ scalacOptions ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "scalajs-react-interface" %%% "universal" % "2017.7.9-RC" % Provided,
-  "scalajs-react-interface" %%% "core" % "2017.7.9-RC" % Provided,
+  "scalajs-react-interface" %%% "universal" % "2017.12.28-RC" % Provided,
+  "scalajs-react-interface" %%% "core" % "2017.12.28-RC" % Provided,
   "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
 )
 
@@ -71,12 +70,13 @@ def runJest() = {
   if (jestResult != 0) throw new IllegalStateException("Jest Suite failed")
 }
 
-resolvers += Resolver.bintrayRepo("scalajs-react-interface", "maven")
-resolvers += Resolver.bintrayRepo("scalajs-jest", "maven")
+resolvers ++=Seq(Resolver.bintrayRepo("scalajs-react-interface", "maven"),
+  Resolver.bintrayRepo("scalajs-jest", "maven"),
+  Resolver.bintrayRepo("scalajs-plus", "maven"))
 
 libraryDependencies ++= Seq(
-  "org.scala-js" %%% "scalajs-dom" % "0.9.3" % Test,
-  "scalajs-jest" %%% "core" % "2017.7.9-beta" % Test
+  "org.scala-js" %%% "scalajs-dom" % "0.9.4" % Test,
+  "scalajs-jest" %%% "core" % "2017.12.27-RC" % Test
 )
 //scalaJSStage in Global := FastOptStage
 scalaJSStage in Global := FullOptStage

package.json

@@ -11,6 +11,6 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "jest": "^20.0.4"
+    "jest": "^22.0.4"
   }
 }

project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=0.13.15
+sbt.version=1.0.4
 

project/plugins.sbt

@@ -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")

src/main/scala/sri/relay/QueryRenderer.scala

@@ -1,11 +1,8 @@
 package sri.relay
 
 import sri.core.{CreateElementJSNoInline, JSComponent, ReactElement}
-import sri.macros.{
-  FunctionObjectMacro,
-  OptDefault => NoValue,
-  OptionalParam => U
-}
+import scalajsplus.macros.{FunctionObjectMacro}
+import scalajsplus.{OptDefault => NoValue, OptionalParam => U}
 import sri.relay.runtime.CacheConfig
 import sri.relay.runtime.query.GraphQLTaggedNode
 import sri.relay.runtime.store.RelayEnvironment

src/main/scala/sri/relay/RelayJS.scala

@@ -1,7 +1,8 @@
 package sri.relay
 
 import sri.core._
-import sri.macros.{FunctionObjectMacro, OptDefault, OptionalParam}
+import scalajsplus.macros.{FunctionObjectMacro}
+import scalajsplus.{OptDefault, OptionalParam}
 import sri.relay.runtime.query.GraphQLTaggedNode
 import sri.relay.runtime.store.{RecordSourceProxy, RelayEnvironment}
 

src/main/scala/sri/relay/runtime/handlers/RelayConnectionHandler.scala

@@ -1,6 +1,6 @@
 package sri.relay.runtime.handlers
 
-import sri.macros.FunctionObjectMacro
+import scalajsplus.macros.FunctionObjectMacro
 import sri.relay.runtime.store.{RecordProxy, RecordSourceProxy}
 
 import scala.scalajs.js

src/main/scala/sri/relay/runtime/mutation/RelayCommitMutation.scala

@@ -1,7 +1,8 @@
 package sri.relay.runtime.mutation
 
 import org.scalajs.dom.raw.{Blob, File}
-import sri.macros.{FunctionObjectMacro, OptDefault, OptionalParam}
+import scalajsplus.macros.{FunctionObjectMacro}
+import scalajsplus.{OptDefault, OptionalParam}
 import sri.relay.runtime.{PayloadError, RangeBehaviors}
 import sri.relay.runtime.query.GraphQLTaggedNode
 import sri.relay.runtime.store.{RecordSourceSelectorProxy, RelayEnvironment}
@@ -112,7 +113,7 @@ object RangeAddConfig {
               OptDefault,
             rangeBehaviors: OptionalParam[RangeBehaviors] = OptDefault,
             edgeName: String): RangeAddConfig = {
-    import sri.universal.DangerousUnionToJSAnyImplicit._
+    import scalajsplus.DangerousUnionToJSAnyImplicit._
     val p = FunctionObjectMacro()
     p.asInstanceOf[js.Dynamic].updateDynamic("type")("RANGE_ADD")
     p.asInstanceOf[RangeAddConfig]
@@ -132,7 +133,7 @@ object RangeDeleteConfig {
       connectionKeys: OptionalParam[js.Array[ConnectionKey]] = OptDefault,
       deletedIDFieldName: OptionalParam[String | js.Array[String]] = OptDefault,
       pathToConnection: js.Array[String]): RangeDeleteConfig = {
-    import sri.universal.DangerousUnionToJSAnyImplicit._
+    import scalajsplus.DangerousUnionToJSAnyImplicit._
     val p = FunctionObjectMacro()
     p.asInstanceOf[js.Dynamic].updateDynamic("type")("RANGE_DELETE")
     p.asInstanceOf[RangeDeleteConfig]

src/main/scala/sri/relay/runtime/network/package.scala

@@ -1,7 +1,8 @@
 package sri.relay.runtime
 
 import org.scalajs.dom.raw.{Blob, File}
-import sri.macros.{FunctionObjectMacro, OptDefault, OptionalParam}
+import scalajsplus.macros.{FunctionObjectMacro}
+import scalajsplus.{OptDefault, OptionalParam}
 import sri.relay.runtime.store.{MutableRecordSource, Observer}
 
 import scala.scalajs.js

src/main/scala/sri/relay/runtime/store/RelayStaticEnvironment.scala

@@ -1,7 +1,8 @@
 package sri.relay.runtime.store
 
 import org.scalajs.dom.raw.{Blob, File}
-import sri.macros.{FunctionObjectMacro, OptDefault, OptionalParam}
+import scalajsplus.macros.{FunctionObjectMacro}
+import scalajsplus.{OptDefault, OptionalParam}
 import sri.relay.runtime.{
   CacheConfig,
   ConcreteBatch,

src/test/scala/sri/relay/SimpleTest.scala

@@ -2,7 +2,7 @@ package sri.relay
 
 class SimpleTest extends BaseTest {
 
-  test("simple", () => {
+  test("simple") {
     expect(true).toBeTruthy()
-  })
+  }
 }