From a809319cabfd94087a348d7d95f95ecc5a22d659 Mon Sep 17 00:00:00 2001 From: chandu0101 Date: Thu, 28 Dec 2017 23:39:31 +0530 Subject: [PATCH] update --- .travis.yml | 3 +-- build.sbt | 22 +++++++++---------- package.json | 2 +- project/build.properties | 2 +- project/plugins.sbt | 8 +++---- .../scala/sri/navigation/TypeDefinition.scala | 19 ++++++++-------- .../sri/navigation/navigators/package.scala | 3 ++- src/main/scala/sri/navigation/package.scala | 3 ++- .../sri/navigation/routers/package.scala | 3 ++- .../scala/sri/navigation/SimpleTest.scala | 4 ++-- 10 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0efdb7..f6f77d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: scala scala: -- 2.12.2 -- 2.11.11 +- 2.12.4 jdk: - oraclejdk8 diff --git a/build.sbt b/build.sbt index 323c6a4..a3edf87 100644 --- a/build.sbt +++ b/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 diff --git a/package.json b/package.json index cd48de5..a7a9484 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,6 @@ }, "devDependencies": {}, "dependencies": { - "jest": "^20.0.4" + "jest": "^22.0.4" } } diff --git a/project/build.properties b/project/build.properties index 6818e9c..cd928ea 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=0.13.15 +sbt.version=1.0.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index 490cb0e..392b7d9 100644 --- a/project/plugins.sbt +++ b/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") diff --git a/src/main/scala/sri/navigation/TypeDefinition.scala b/src/main/scala/sri/navigation/TypeDefinition.scala index 390a06f..f197c22 100644 --- a/src/main/scala/sri/navigation/TypeDefinition.scala +++ b/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[ diff --git a/src/main/scala/sri/navigation/navigators/package.scala b/src/main/scala/sri/navigation/navigators/package.scala index 6c2a130..26ae9b1 100644 --- a/src/main/scala/sri/navigation/navigators/package.scala +++ b/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 diff --git a/src/main/scala/sri/navigation/package.scala b/src/main/scala/sri/navigation/package.scala index e2f7e3a..ddc0596 100644 --- a/src/main/scala/sri/navigation/package.scala +++ b/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 diff --git a/src/main/scala/sri/navigation/routers/package.scala b/src/main/scala/sri/navigation/routers/package.scala index 01a550f..fe684f1 100644 --- a/src/main/scala/sri/navigation/routers/package.scala +++ b/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 diff --git a/src/test/scala/sri/navigation/SimpleTest.scala b/src/test/scala/sri/navigation/SimpleTest.scala index e717528..9887786 100644 --- a/src/test/scala/sri/navigation/SimpleTest.scala +++ b/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() - }) + } }