update

chandu0101 · chandu0101 · commit 2721b6ec0200 · 2017-12-28T22:52:11.000+05:30
diff --git 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
@@ -1,16 +1,15 @@
 name := "universal"
 
-//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,10 +21,10 @@ scalacOptions ++= Seq(
 
 //Dependencies
 libraryDependencies ++= Seq(
-  "scalajs-react-interface" %%% "core" % "2017.7.9-RC" % Provided,
+  "scalajs-react-interface" %%% "core" % "2017.12.28-RC" % Provided,
   "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
-  "scalajs-react-interface" %%% "macros" % "2017.7.9-RC",
-  "org.scala-js" %%% "scalajs-dom" % "0.9.3"
+  "scalajs-plus" %%% "core" % "2017.12.27",
+  "org.scala-js" %%% "scalajs-dom" % "0.9.4"
 )
 
 //bintray
@@ -77,8 +76,9 @@ def runJest() = {
 
 resolvers += Resolver.bintrayRepo("scalajs-react-interface", "maven")
 resolvers += Resolver.bintrayRepo("scalajs-jest", "maven")
+resolvers += 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
 )
diff --git a/package.json b/package.json
@@ -11,8 +11,6 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "jest": "^20.0.4",
-    "react": "next",
-    "react-dom": "next"
+    "jest": "^22.0.4"
   }
 }
diff --git a/project/DepsVerifyPlugin.scala b/project/DepsVerifyPlugin.scala
diff --git 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
@@ -1,4 +1,5 @@
-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/universal/DangerousUnionToJSAnyImplicit.scala b/src/main/scala/sri/universal/DangerousUnionToJSAnyImplicit.scala
diff --git a/src/main/scala/sri/universal/apis/Alert.scala b/src/main/scala/sri/universal/apis/Alert.scala
@@ -3,7 +3,8 @@ package sri.universal.apis
 import scala.scalajs.js
 import scala.scalajs.js.Dynamic.{literal => json}
 import scala.scalajs.js.annotation.JSImport
-import sri.macros.{FunctionObjectMacro, OptDefault => NoValue, OptionalParam => OP}
+import scalajsplus.macros.{FunctionObjectMacro}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 
 @js.native
 trait Alert extends js.Object {
diff --git a/src/main/scala/sri/universal/components/ActivityIndicator.scala b/src/main/scala/sri/universal/components/ActivityIndicator.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/AnimatedImage.scala b/src/main/scala/sri/universal/components/AnimatedImage.scala
@@ -1,13 +1,8 @@
 package sri.universal.components
 
 import sri.core._
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  rename,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/AnimatedView.scala b/src/main/scala/sri/universal/components/AnimatedView.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core._
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/Button.scala b/src/main/scala/sri/universal/components/Button.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/Image.scala b/src/main/scala/sri/universal/components/Image.scala
@@ -1,13 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  rename,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.apis.LayoutEvent
 import sri.universal.{ImageEvent, MergeJSObjects, ReactEvent}
 
diff --git a/src/main/scala/sri/universal/components/KeyboardAvoidingView.scala b/src/main/scala/sri/universal/components/KeyboardAvoidingView.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 import sri.universal.apis.LayoutEvent
 
diff --git a/src/main/scala/sri/universal/components/ListView.scala b/src/main/scala/sri/universal/components/ListView.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, ReactElement, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/Lists.scala b/src/main/scala/sri/universal/components/Lists.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, ReactClass, ReactElement, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.apis.LayoutEvent
 import sri.universal.{MergeJSObjects, ReactEvent}
 
@@ -259,7 +255,7 @@ object FlatList {
       @exclude key: String | Int = null,
       @exclude ref: js.Function1[FlatListComponent.type, Unit] = null)
     : ReactElement { type Instance = FlatListComponent.type } = {
-    import sri.universal.DangerousUnionToJSAnyImplicit._
+    import scalajsplus.DangerousUnionToJSAnyImplicit._
     val props = FunctionObjectMacro()
     extraProps.foreach(v => {
       MergeJSObjects(props, v)
diff --git a/src/main/scala/sri/universal/components/Modal.scala b/src/main/scala/sri/universal/components/Modal.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/Picker.scala b/src/main/scala/sri/universal/components/Picker.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/RefreshControl.scala b/src/main/scala/sri/universal/components/RefreshControl.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/ScrollView.scala b/src/main/scala/sri/universal/components/ScrollView.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, ReactElement, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.{MergeJSObjects, ReactEvent, XYValueLiteral}
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/Slider.scala b/src/main/scala/sri/universal/components/Slider.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/Switch.scala b/src/main/scala/sri/universal/components/Switch.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/Text.scala b/src/main/scala/sri/universal/components/Text.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.apis.LayoutEvent
 import sri.universal.{MergeJSObjects, ReactEvent, SyntheticEvent}
 
diff --git a/src/main/scala/sri/universal/components/TextInput.scala b/src/main/scala/sri/universal/components/TextInput.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.{MergeJSObjects, ReactEvent, TextInputEvent}
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/TouchableHighlight.scala b/src/main/scala/sri/universal/components/TouchableHighlight.scala
@@ -1,12 +1,8 @@
 package sri.universal.components
 
 import sri.core.{JSComponent, _}
-import sri.macros.{
-  FunctionObjectMacro,
-  exclude,
-  OptDefault => NoValue,
-  OptionalParam => OP
-}
+import scalajsplus.macros.{FunctionObjectMacro,exclude,rename}
+import scalajsplus.{ OptDefault => NoValue, OptionalParam => OP}
 import sri.universal.MergeJSObjects
 
 import scala.scalajs.js
diff --git a/src/main/scala/sri/universal/components/TouchableOpacity.scala b/src/main/scala/sri/universal/components/TouchableOpacity.scala
diff --git a/src/main/scala/sri/universal/components/TouchableWithoutFeedback.scala b/src/main/scala/sri/universal/components/TouchableWithoutFeedback.scala
diff --git a/src/main/scala/sri/universal/components/View.scala b/src/main/scala/sri/universal/components/View.scala
diff --git a/src/main/scala/sri/universal/styles/InlineStylesMacro.scala b/src/main/scala/sri/universal/styles/InlineStylesMacro.scala
diff --git a/src/main/scala/sri/universal/styles/UniversalStyle.scala b/src/main/scala/sri/universal/styles/UniversalStyle.scala
diff --git a/src/test/scala/sri/universal/styles/InlineStyleSheetUniversalTest.scala b/src/test/scala/sri/universal/styles/InlineStyleSheetUniversalTest.scala
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -1,8 +1,7 @@ @@
 language: scala
 scala:
 -- 2.12.2
 -- 2.11.11
 +- 2.12.4
 jdk:
 - oraclejdk8
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`	`},`
`12`	`12`	`"devDependencies": {},`
`13`	`13`	`"dependencies": {`
`14`		`- "jest": "^20.0.4",`
`15`		`- "react": "next",`
`16`		`- "react-dom": "next"`
	`14`	`+ "jest": "^22.0.4"`
`17`	`15`	`}`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-sbt.version=0.13.15`
	`1`	`+sbt.version=1.0.4`
`2`	`2`