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 := "navigation"
 
-//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",
@@ -22,8 +21,8 @@ scalacOptions ++= Seq(
 //Dependencies
 
 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)
 
 //bintray
 resolvers += Resolver.jcenterRepo
@@ -69,12 +68,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/navigation/TypeDefinition.scala

@@ -1,13 +1,12 @@
 package sri.navigation
 
 import sri.core.{ReactClass, ReactElement, ReactJSProps}
-import sri.macros.{
+import scalajsplus.macros.{
   FunctionObjectMacro,
-  rename,
-  OptDefault => NoValue,
-  OptionalParam => OP
+  rename
 }
-
+import scalajsplus.{  OptDefault => NoValue,
+  OptionalParam => OP}
 import scala.scalajs.js
 import scala.scalajs.js.Dynamic.literal
 import scala.scalajs.js.{undefined, |, UndefOr => U}
@@ -92,7 +91,7 @@ object NavigationStackScreenOptions {
             headerLeft: OP[ReactElement] = NoValue,
             headerRight: OP[ReactElement] = NoValue)
     : NavigationStackScreenOptions = {
-    import sri.universal.DangerousUnionToJSAnyImplicit._
+    import scalajsplus.DangerousUnionToJSAnyImplicit._
     val p = FunctionObjectMacro()
     p.asInstanceOf[NavigationStackScreenOptions]
   }
@@ -107,7 +106,7 @@ object NavigationTabScreenOptions {
       tabBarIcon: OP[IconOptions => ReactElement] = NoValue,
       tabBarLabel: OP[String | ReactElement] = NoValue,
       tabBarVisible: OP[Boolean] = NoValue): NavigationTabScreenOptions = {
-    import sri.universal.DangerousUnionToJSAnyImplicit._
+    import scalajsplus.DangerousUnionToJSAnyImplicit._
     val p = FunctionObjectMacro()
     p.asInstanceOf[NavigationTabScreenOptions]
   }
@@ -123,7 +122,7 @@ object NavigationDrawerScreenOptions {
       drawerLabel: OP[
         String | ReactElement | js.Function1[IconOptions, ReactElement]] =
         NoValue): NavigationDrawerScreenOptions = {
-    import sri.universal.DangerousUnionToJSAnyImplicit._
+    import scalajsplus.DangerousUnionToJSAnyImplicit._
     val p = FunctionObjectMacro()
     p.asInstanceOf[NavigationDrawerScreenOptions]
   }
@@ -302,7 +301,7 @@ object NavigationScreenRouteConfig {
       @rename("navigationOptions") navigationOptionsDynamic: OP[
         NavigationScreenConfigProps[C] => T] = NoValue)
     : NavigationScreenRouteConfig = {
-    import sri.universal.DangerousUnionToJSAnyImplicit._
+    import scalajsplus.DangerousUnionToJSAnyImplicit._
     val p = FunctionObjectMacro()
     p.asInstanceOf[NavigationScreenRouteConfig]
   }
@@ -316,7 +315,7 @@ trait NavigationLazyScreenRouteConfig extends js.Object {
 }
 
 object NavigationLazyScreenRouteConfig {
-  import sri.universal.DangerousUnionToJSAnyImplicit._
+  import scalajsplus.DangerousUnionToJSAnyImplicit._
   @inline
   def apply(
       getScreen: js.Function0[NavigationScreenComponent[_, _]] | NavigationNavigator[

src/main/scala/sri/navigation/navigators/package.scala

@@ -1,7 +1,8 @@
 package sri.navigation
 
 import sri.core.{ComponentConstructor, ReactClass, ReactElement}
-import sri.macros.{FunctionObjectMacro, OptDefault, OptionalParam}
+import scalajsplus.{OptDefault, OptionalParam}
+import scalajsplus.macros.FunctionObjectMacro
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport

src/main/scala/sri/navigation/package.scala

@@ -1,7 +1,8 @@
 package sri
 
 import sri.core.{ComponentConstructor, ReactElement}
-import sri.macros.{OptDefault, OptionalParam}
+import scalajsplus.{OptDefault, OptionalParam}
+import scalajsplus.macros.FunctionObjectMacro
 import sri.navigation.navigators.NavigationNavigatorConstructor
 import sri.universal.PropTypes
 import sri.universal.apis.AnimatedValue

src/main/scala/sri/navigation/routers/package.scala

@@ -1,6 +1,7 @@
 package sri.navigation
 
-import sri.macros.{FunctionObjectMacro, OptDefault, OptionalParam}
+import scalajsplus.{OptDefault, OptionalParam}
+import scalajsplus.macros.FunctionObjectMacro
 
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSImport

src/test/scala/sri/navigation/SimpleTest.scala

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