diff --git a/.travis.yml b/.travis.yml
index 2124ceb..2d7d3f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ env:
- secure: ArRCYDfNlBMAQJpRBtFedg6Bw43nvxfkh7Eec0oFUdxrO9z1zf9ezpNeyx67lnJ29E8i9eEWtaT+XE1W8KpewQJHogxq84A1PoVI84VMtzf5NAwjZBN+TV3mPbmme8rADmFAFWBD7zF5eSpNtQkDK2BUjC4uwrGVP0/0K5VhunKTBBg4jW2r+cogncLYJ9KTEpMx9HhO3hOvdnR0v8oqOptlCla6Nmnb8DjyVVbO1fg8pRW2XQ4wE012e7MHRnw0CaRge1kaj8yrRMJhdxFgrY0OdetKFS1DJ1tSeQCT8AdCXErNN8M6lGRiYELpIddEd479NsJ4QDTZ0dU2tHfWHJCakb4CfehJ0Qm6Q4NVQafIAlwLfIROV3TaoZkjS1ZuLhV0az3pdnzNGJGkLmjV41otk1DoboV4lON9rjiyO04Gj53M+ZpmsbjxDQiCU07E5fSrT6Hdnt0Z0RbLBPE/ge21UNK8WBUElD3XMtsFSPvOziJu6iUVxw+CNx1yQVu2ENEDMRKf/qdulx4H2Ee3TIXYtYqMvYnxP2NN/BVJ2cxp+YiNpnzJBl3o6rnvPoF+vTbEKBEqf4cpuITVBADHUHwHsRaSFdTAdcT3/6VhltCcYuPOHWzONlMfQZJLQhi25PTO7L8eImatFKpccPR1Aqido57AYUtzajk9m9pRDDo=
- secure: wRICZjpieMeuW6/Od8l+DqzpLgo5wxofbSGM7TUqP1NaSDBvmCYv9fKzZPsVQqyEdet4Q+xNw+28ymbGo9toToAcdLSvClfCPglpLmg9HoiB3y1xp4cy84/i+riHYz1NbOgFrIf5TsG53IMqd74PAtblbh4JGvQEzILupk45XPGydp7L5sEE5JOibZj6YrFkixbadfCWWFEmwx7SJp83kSOeaq12h3AWoaBmfza4BOYe+NDa2oGaITcz7iWxZUGDdPaWSdZyqOx0lPqprCPMdRwpe+VihrpucH8Qa0aWSxJNCAYNJI8vk95FWbtRnycMRluVdm3v5WWvczNrjyj0aU3n4irtjeV8Gfter1F9bvis7LVfH5i+xTUmqkcrIciIyuODTAdsUiMWBGg9wqCEOrvcAmH+gVC/2a8X/VO0rusE4buGBrQsxCXUGAyswGjaMZHbN6mVdMXHwNPXG6s4nJdUAFGu6ThzeTzuByYUpXj80u6AtbUgmvcAd57lLiLYFfQv8IIqxQ8pf8oRojB/imvXKrouLkxZO8jVoiVvMFy5R8Pcb+UWYUbTW4ylHScOQPkdo4riMa+3qlBcO5g07u7EXSu0GHO6y/ci4scLNFkwdCoVjcf42oeFZOlrKJ4VV4VVBBA4uQ7mflRlSX0l3PlUg4A+dY5J6CiMjE5z2z4=
before_install:
-- nvm install 10 &&
- nvm use 10
+- nvm install 12 &&
+ nvm use 12
- node --version &&
npm --version
- if [ $TRAVIS_PULL_REQUEST = 'false' ]; then
@@ -28,7 +28,7 @@ script:
sbt clean publish;
else
echo "Publish a release version=$TRAVIS_TAG";
- version=$TRAVIS_TAG sbt clean publishSigned sonatypeRelease;
+ version=$TRAVIS_TAG sbt clean publishSigned sonatypeBundleRelease;
fi
else
echo "This is not a master branch commit. Skipping the publish/release step";
@@ -36,6 +36,7 @@ script:
cache:
directories:
- ~/.npm
+ - ~/.nvm
- "$HOME/.ivy2/cache"
- "$HOME/.sbt"
before_cache:
diff --git a/README.md b/README.md
index c1472ea..9fceb3d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[![Build Status](https://travis-ci.com/scommons/scommons-client.svg?branch=master)](https://travis-ci.com/scommons/scommons-client)
[![Coverage Status](https://coveralls.io/repos/github/scommons/scommons-client/badge.svg?branch=master)](https://coveralls.io/github/scommons/scommons-client?branch=master)
[![scala-index](https://index.scala-lang.org/scommons/scommons-client/scommons-client-ui/latest.svg)](https://index.scala-lang.org/scommons/scommons-client/scommons-client-ui)
-[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-0.6.17.svg)](https://www.scala-js.org)
+[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-0.6.29.svg)](https://www.scala-js.org)
## Scala Commons Client
Common Scala.js, React.js web-client utilities and components.
diff --git a/pgp.sbt b/pgp.sbt
index b25983a..641294a 100644
--- a/pgp.sbt
+++ b/pgp.sbt
@@ -1,7 +1,6 @@
//see: https://www.scala-sbt.org/sbt-pgp/usage.html
-useGpg := false
pgpPublicRing := file("./travis/pubring.gpg")
pgpSecretRing := file("./travis/secring.gpg")
pgpPassphrase := sys.env.get("PGP_PASS").map(_.toArray)
diff --git a/project/src/main/scala/common/Libs.scala b/project/src/main/scala/common/Libs.scala
index 41ddaf8..0bf1e04 100644
--- a/project/src/main/scala/common/Libs.scala
+++ b/project/src/main/scala/common/Libs.scala
@@ -6,10 +6,10 @@ import scommons.sbtplugin.project.CommonLibs
object Libs extends CommonLibs {
- val scommonsNodejsVersion = "0.3.1"
- val scommonsReactVersion = "0.3.0"
- private val scommonsApiVersion = "0.3.0"
- private val sjsReactJsVer = "0.14.0"
+ val scommonsNodejsVersion = "1.0.0-SNAPSHOT"
+ val scommonsReactVersion = "1.0.0-SNAPSHOT"
+ private val scommonsApiVersion = "1.0.0-SNAPSHOT"
+ private val sjsReactJsVer = "0.15.0"
lazy val scommonsApiXhr = Def.setting("org.scommons.api" %%% "scommons-api-xhr" % scommonsApiVersion)
@@ -17,6 +17,6 @@ object Libs extends CommonLibs {
lazy val scommonsReactDom = Def.setting("org.scommons.react" %%% "scommons-react-dom" % scommonsReactVersion)
lazy val scommonsReactRedux = Def.setting("org.scommons.react" %%% "scommons-react-redux" % scommonsReactVersion)
- lazy val sjsReactJsRouterDom = Def.setting("io.github.shogowada" %%% "scalajs-reactjs-router-dom" % sjsReactJsVer)
- lazy val sjsReactJsRouterRedux = Def.setting("io.github.shogowada" %%% "scalajs-reactjs-router-redux" % sjsReactJsVer)
+ lazy val sjsReactJsRouterDom = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-router-dom" % sjsReactJsVer)
+ lazy val sjsReactJsRouterRedux = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-router-redux" % sjsReactJsVer)
}
diff --git a/project/src/main/scala/definitions/ClientModule.scala b/project/src/main/scala/definitions/ClientModule.scala
index 54b8a27..b5ce953 100644
--- a/project/src/main/scala/definitions/ClientModule.scala
+++ b/project/src/main/scala/definitions/ClientModule.scala
@@ -26,12 +26,7 @@ object ClientModule {
sonatypeProfileName := "org.scommons",
publishMavenStyle := true,
publishArtifact in Test := false,
- publishTo := {
- if (isSnapshot.value)
- Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
- else
- Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
- },
+ publishTo := sonatypePublishToBundle.value,
pomExtra := {
https://github.com/scommons/scommons-client
diff --git a/ui/src/test/scala/scommons/client/ui/page/PaginationAlignmentSpec.scala b/ui/src/test/scala/scommons/client/ui/page/PaginationAlignmentSpec.scala
index 0dd97cf..766b90a 100644
--- a/ui/src/test/scala/scommons/client/ui/page/PaginationAlignmentSpec.scala
+++ b/ui/src/test/scala/scommons/client/ui/page/PaginationAlignmentSpec.scala
@@ -1,8 +1,8 @@
package scommons.client.ui.page
-import org.scalatest.{FlatSpec, Matchers}
+import scommons.nodejs.test.TestSpec
-class PaginationAlignmentSpec extends FlatSpec with Matchers {
+class PaginationAlignmentSpec extends TestSpec {
it should "return style according to pagination alignment type" in {
//when & then
diff --git a/ui/src/test/scala/scommons/client/ui/page/PaginationPanelPropsSpec.scala b/ui/src/test/scala/scommons/client/ui/page/PaginationPanelPropsSpec.scala
index 69d3982..39384fc 100644
--- a/ui/src/test/scala/scommons/client/ui/page/PaginationPanelPropsSpec.scala
+++ b/ui/src/test/scala/scommons/client/ui/page/PaginationPanelPropsSpec.scala
@@ -1,8 +1,8 @@
package scommons.client.ui.page
-import org.scalatest.{FlatSpec, Matchers}
+import scommons.nodejs.test.TestSpec
-class PaginationPanelPropsSpec extends FlatSpec with Matchers {
+class PaginationPanelPropsSpec extends TestSpec {
it should "fail if totalPages is less than 1" in {
def assertFailedProps(totalPages: Int): Unit = {
diff --git a/ui/src/test/scala/scommons/client/ui/tab/TabDirectionSpec.scala b/ui/src/test/scala/scommons/client/ui/tab/TabDirectionSpec.scala
index bb11d58..cb7088a 100644
--- a/ui/src/test/scala/scommons/client/ui/tab/TabDirectionSpec.scala
+++ b/ui/src/test/scala/scommons/client/ui/tab/TabDirectionSpec.scala
@@ -1,8 +1,8 @@
package scommons.client.ui.tab
-import org.scalatest.{FlatSpec, Matchers}
+import scommons.nodejs.test.TestSpec
-class TabDirectionSpec extends FlatSpec with Matchers {
+class TabDirectionSpec extends TestSpec {
it should "return style according to tab direction type" in {
//when & then
diff --git a/ui/src/test/scala/scommons/client/ui/tab/TabPanelPropsSpec.scala b/ui/src/test/scala/scommons/client/ui/tab/TabPanelPropsSpec.scala
index 7889fa8..dd47375 100644
--- a/ui/src/test/scala/scommons/client/ui/tab/TabPanelPropsSpec.scala
+++ b/ui/src/test/scala/scommons/client/ui/tab/TabPanelPropsSpec.scala
@@ -1,8 +1,8 @@
package scommons.client.ui.tab
-import org.scalatest.{FlatSpec, Matchers}
+import scommons.nodejs.test.TestSpec
-class TabPanelPropsSpec extends FlatSpec with Matchers {
+class TabPanelPropsSpec extends TestSpec {
it should "fail if selectedIndex is out of items range" in {
def assertFailedProps(props: => TabPanelProps, selectedIndex: Int): Unit = {
diff --git a/ui/src/test/scala/scommons/client/util/ActionsDataSpec.scala b/ui/src/test/scala/scommons/client/util/ActionsDataSpec.scala
index a996ab3..33254d0 100644
--- a/ui/src/test/scala/scommons/client/util/ActionsDataSpec.scala
+++ b/ui/src/test/scala/scommons/client/util/ActionsDataSpec.scala
@@ -1,8 +1,8 @@
package scommons.client.util
-import org.scalatest.{FlatSpec, Matchers}
+import scommons.nodejs.test.TestSpec
-class ActionsDataSpec extends FlatSpec with Matchers {
+class ActionsDataSpec extends TestSpec {
it should "return empty actions when ActionsData.empty" in {
//when
diff --git a/ui/src/test/scala/scommons/client/util/BrowsePathSpec.scala b/ui/src/test/scala/scommons/client/util/BrowsePathSpec.scala
index 9743ca7..0f14bb1 100644
--- a/ui/src/test/scala/scommons/client/util/BrowsePathSpec.scala
+++ b/ui/src/test/scala/scommons/client/util/BrowsePathSpec.scala
@@ -1,8 +1,8 @@
package scommons.client.util
-import org.scalatest.{FlatSpec, Matchers}
+import scommons.nodejs.test.TestSpec
-class BrowsePathSpec extends FlatSpec with Matchers {
+class BrowsePathSpec extends TestSpec {
it should "perform value equality" in {
//given