From 5e0ffcbe0d3a4cb17aaad94e3f598fc7aa0bafcf Mon Sep 17 00:00:00 2001 From: Viktor Podzigun Date: Fri, 24 Dec 2021 13:10:29 +0100 Subject: [PATCH] Switched to Scala.js v1.1+ --- .travis.yml | 3 --- README.md | 5 ++--- project/plugins.sbt | 13 ++----------- project/src/main/scala/common/Libs.scala | 2 +- .../react/showcase/ErrorBoundaryDemoSpec.scala | 2 +- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c0344f..b892fd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,6 @@ env: - secure: Px1jYCcHrx4Eufto0lOK8QOciiZ72baECbZWYEtz9CZfjpmuFIovfSShNrni2rYCTmxdZmpl2Royq+BhbO7IbVKXXGP3Spq0cxPfVa1VQ+s9GRjbxY7QyXUbXq2Xcs/2xiieBXLihrZwIeRKGW3SXmwiZvypYyPknugezPgx2I0ULIZOJGD3LC2WAKfdY/a5Ok6ErxQj35U01ONif6ey2B97+s3w8D/P1Qw1f2p5dpU5QCr4iXfKQgC4Cje1/A4s+Qk2BIiQbUEmBRLeTWLsAcx501BCmMoFc+t64behU6wDflvcHdDk9pWUfii0ub4PM3QNYPydTBzadlr29rkrZOL/JtXpemcRh6q0aJLcLofmJd4ess7NIzAu7/oPVWe9sv1H989GKtuqDWrZo1fTcGPYT5nmjvssrYCVPl5HCJG/jtyN4EHtNnzpl51OA4p6K3itTqdSm1JwoLdz6ReGsQi30hdloxHTyOmJDYY5AvTz8utIdAnKr8EjSM5xFbN7bApWISDAeRNrk63hCUhJvCrmBWI04PLZrT+lRylhXTieDit09jZOpfbFRHUZCw2eFp7ddhUNZArnOZOn7phphgxqIXnaRpWYDgGaCqJo4d79URJGowssRh5Vs+ozOkSvZfUlE/crQDLwaXnVt25V6EZWrOOMHUSW/kLiWCg8Vqc= - secure: a8GtpUc81dCfS2D/VKbNKxz3nztcnHyPatS8QHUr2nG2hTMZbL/7O4714EtI1QlBb7Ke64tAhAASaszJqDlWkI9xuMo6G+9U2Ui/FMG/XMe3CiBPoU56jx7bSOP7SG02wsE39hF/pqjuMDTNDSBz9+vSuyB1GnwLP15bej49ityWet/6yDAZac9atwNbLRfeuIfpQa8lfETi9vUw4o8f83gqqg4uG+k0QCTRzGMlMKMXTt9zmTQJQUVwyZrgnGweHCsO9WCpIkkSOwpzphd/6IBfob+RcCnqDPMwfAZEAWVNFs3OLznSUvQdBbyGHKlXktrK2o6johdhq6X+bmezMcxZo9di4PLYcGZiFzW0iMZKv04CVJv8Q5gUScRhH0m6IaqB93p9XPX+EV8WtXNNlSoRuAWlw6x+oyreQ7dYQY1/c5A/WXzxJFDjrITRV4y68zT8zqoTUNpDlpTtK76qXVZgWEb4ErAb0iCsVUegVgzZyodMDviNW4F7w8GvNXKUqbUV4swT0/DP2C0zJglh7U5Pxbnp8UHUNvnvf8HwrlHRUGkRfZRQ+oaFIS3XJk0kCwpETIOwnUeIKVfxVM9F3eZTzKCYCdinYKS0OsWTbtxs98kFl2gBw/Sm572bQEL3LaJTc0k/u7ZpB+bQEK7sEvk6vIr3+M/Yw2YkK/hlwtQ= - secure: X0pCqLOeXtdnwroruTgx+g89a6C1BvH6YVnlEyLVcPqSSo9pOo145CrwI1O5JX+Sej3t7J+psL6WEW0AmzRlk0MgxUIdhTkIpj7p2cRvyMVtSjI5qTDmnpCec48UbrwFSZ90BfvJddCVeZcB+aDWga7Fe1LzyN1eLc42hmFHq0p1WAfZUisHI0YKb3RzOiBKx+SzlLDN2BW3gl1OFRQl7ZFX6ORbgZhhcmOSEf74VHI3JiWLfDaPOI1KspeR+e1yQ7hSvA7V94rIz2xugv9xRgGyBLg1k9moMPR8VrBj717yn+tfXUxLOOIQUW1GLDhtlt5y/n3+yceQ6zzi9w9Keplx0wmQ29Soi5UfuYvRrSjifmzAkKl+RYZ6coJmvzcGKYatwID022dbDaPM28JQIBKmvT+Hy8j/3eyPaXHDHpThrneDawIXbdQbiT7uH62HM+wWJwb+tQrEdRMwJwlisxNBh1axefqFYV4cSsabtuT41F+oAfZKWObferSD9evlx8zABSKDCQsZfM3/+PUIo2w6WWxlviOOyzbrXIH6Ll65X3CHznh26HtdCwyTjYB3Llqez8qhV0zukIrKcNcAJVzeoiRZIjAS3KHjt8CokE2wetpvhTqbsym0zTI/zXaMZS58ioahrkR6pb+Fa7Pu9wjwhVU1+McZDcf/o9Gn7h0= - jobs: - - SCALAJS_VERSION=0.6.31 - - SCALAJS_VERSION=1.1.0 before_install: - nvm install 12 && nvm use 12 diff --git a/README.md b/README.md index a24da8f..6696621 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ [![Build Status](https://travis-ci.com/scommons/scommons-react.svg?branch=master)](https://travis-ci.com/scommons/scommons-react) [![Coverage Status](https://coveralls.io/repos/github/scommons/scommons-react/badge.svg?branch=master)](https://coveralls.io/github/scommons/scommons-react?branch=master) -[![scala-index](https://index.scala-lang.org/scommons/scommons-react/scommons-react-core/latest-by-scala-version.svg?targetType=Js)](https://index.scala-lang.org/scommons/scommons-react/scommons-react-core) -[![Scala.js 0.6](https://www.scala-js.org/assets/badges/scalajs-0.6.29.svg)](https://www.scala-js.org) -[![Scala.js 1.0](https://www.scala-js.org/assets/badges/scalajs-1.1.0.svg)](https://www.scala-js.org) +[![scala-index](https://index.scala-lang.org/scommons/scommons-react/scommons-react-core/latest.svg)](https://index.scala-lang.org/scommons/scommons-react/scommons-react-core) +[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.1.0.svg)](https://www.scala-js.org) ## Scala Commons React [Scala.js](https://www.scala-js.org) facades for common [React.js](https://reactjs.org) utilities and components. diff --git a/project/plugins.sbt b/project/plugins.sbt index a449b44..23d7ec7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,17 +1,8 @@ //resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/" resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" -val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.31") - -if (scalaJSVersion.startsWith("0.6")) { - //addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.7.0-SNAPSHOT").changing()) - addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin-sjs06" % "0.7.0") -} -else { - //addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.7.0-SNAPSHOT").changing()) - addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.7.0") -} +addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0-SNAPSHOT").changing()) +//addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.8.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") diff --git a/project/src/main/scala/common/Libs.scala b/project/src/main/scala/common/Libs.scala index 8b607b6..b09ff83 100644 --- a/project/src/main/scala/common/Libs.scala +++ b/project/src/main/scala/common/Libs.scala @@ -7,7 +7,7 @@ import scommons.sbtplugin.project.CommonLibs object Libs extends CommonLibs { val scommonsNodejsVersion = "0.7.0" - private val sjsReactJsVer = "0.17.0" + private val sjsReactJsVer = "0.17.1" lazy val sjsReactJsCore = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-core" % sjsReactJsVer) lazy val sjsReactJsDom = Def.setting("org.scommons.shogowada" %%% "scalajs-reactjs-dom" % sjsReactJsVer) diff --git a/showcase/src/test/scala/scommons/react/showcase/ErrorBoundaryDemoSpec.scala b/showcase/src/test/scala/scommons/react/showcase/ErrorBoundaryDemoSpec.scala index bae90be..4ac470e 100644 --- a/showcase/src/test/scala/scommons/react/showcase/ErrorBoundaryDemoSpec.scala +++ b/showcase/src/test/scala/scommons/react/showcase/ErrorBoundaryDemoSpec.scala @@ -33,7 +33,7 @@ class ErrorBoundaryDemoSpec extends TestSpec with TestRendererUtils { error shouldBe s"Error: java.lang.Exception: test exception" info.toString should startWith ( """Info: - | at ErrorBoundaryDemoSpec$$anon$1""".stripMargin + | -> """.stripMargin ) }) }