From bca6d1fc083d7f37609c9e86414d35763a6b9e4d Mon Sep 17 00:00:00 2001 From: Viktor Podzigun Date: Fri, 23 Jul 2021 10:01:09 +0200 Subject: [PATCH] Upgraded Scala version to 2.13 --- .travis.yml | 5 ++--- README.md | 2 +- project/plugins.sbt | 6 ++++++ project/src/main/scala/common/Libs.scala | 4 ++-- script/docs_gen_assets.sh | 8 ++++---- showcase/index.dev.html | 8 ++++---- .../test/scala/scommons/client/ui/tab/TabPanelSpec.scala | 2 +- .../scala/scommons/client/ui/tree/BrowseTreeSpec.scala | 2 +- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d7d3f3..ac30660 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,8 @@ before_install: tar xv -C travis -f travis/secrets.tar; fi script: -- sbt clean coverage test coverageReport && - sbt coverageAggregate && - sbt coveralls && +- sbt clean coverage test && + sbt coverageAggregate coveralls && if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" -o "$TRAVIS_BRANCH" == "$TRAVIS_TAG" ]; then if [ -z "$TRAVIS_TAG" ]; then echo "Publish a snapshot"; diff --git a/README.md b/README.md index 9fceb3d..c430ed6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,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-index](https://index.scala-lang.org/scommons/scommons-client/scommons-client-ui/latest-by-scala-version.svg?targetType=Js)](https://index.scala-lang.org/scommons/scommons-client/scommons-client-ui) [![Scala.js](https://www.scala-js.org/assets/badges/scalajs-0.6.29.svg)](https://www.scala-js.org) ## Scala Commons Client diff --git a/project/plugins.sbt b/project/plugins.sbt index 25ee8ce..f4267ea 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,3 +5,9 @@ addSbtPlugin(("org.scommons.sbt" % "sbt-scommons-plugin" % "0.5.0-SNAPSHOT").cha //addSbtPlugin("org.scommons.sbt" % "sbt-scommons-plugin" % "0.5.0") addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.3") + +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") + +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7") diff --git a/project/src/main/scala/common/Libs.scala b/project/src/main/scala/common/Libs.scala index e3729cf..0bf1e04 100644 --- a/project/src/main/scala/common/Libs.scala +++ b/project/src/main/scala/common/Libs.scala @@ -6,8 +6,8 @@ import scommons.sbtplugin.project.CommonLibs object Libs extends CommonLibs { - val scommonsNodejsVersion = "0.4.0" - val scommonsReactVersion = "0.4.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" diff --git a/script/docs_gen_assets.sh b/script/docs_gen_assets.sh index f3a28b6..3b4eb7f 100755 --- a/script/docs_gen_assets.sh +++ b/script/docs_gen_assets.sh @@ -3,9 +3,9 @@ set -e sbt "project scommons-client-showcase" clean fullOptJS::webpack -cp "showcase/target/scala-2.12/scalajs-bundler/main/styles/scommons-client-showcase-opt.css" "docs/showcase/assets/styles/scommons-client-showcase-opt.css" -cp "showcase/target/scala-2.12/scalajs-bundler/main/scommons-client-showcase-opt-library.js" "docs/showcase/assets/scommons-client-showcase-opt-library.js" -cp "showcase/target/scala-2.12/scalajs-bundler/main/scommons-client-showcase-opt-loader.js" "docs/showcase/assets/scommons-client-showcase-opt-loader.js" -cp "showcase/target/scala-2.12/scalajs-bundler/main/scommons-client-showcase-opt.js" "docs/showcase/assets/scommons-client-showcase-opt.js" +cp "showcase/target/scala-2.13/scalajs-bundler/main/styles/scommons-client-showcase-opt.css" "docs/showcase/assets/styles/scommons-client-showcase-opt.css" +cp "showcase/target/scala-2.13/scalajs-bundler/main/scommons-client-showcase-opt-library.js" "docs/showcase/assets/scommons-client-showcase-opt-library.js" +cp "showcase/target/scala-2.13/scalajs-bundler/main/scommons-client-showcase-opt-loader.js" "docs/showcase/assets/scommons-client-showcase-opt-loader.js" +cp "showcase/target/scala-2.13/scalajs-bundler/main/scommons-client-showcase-opt.js" "docs/showcase/assets/scommons-client-showcase-opt.js" cp -r "assets/src/main/public/" "docs/showcase/assets/lib/scommons-client-assets/" diff --git a/showcase/index.dev.html b/showcase/index.dev.html index ae395b8..87998aa 100644 --- a/showcase/index.dev.html +++ b/showcase/index.dev.html @@ -8,7 +8,7 @@ - + - - + + + diff --git a/ui/src/test/scala/scommons/client/ui/tab/TabPanelSpec.scala b/ui/src/test/scala/scommons/client/ui/tab/TabPanelSpec.scala index d19642c..ad363a8 100644 --- a/ui/src/test/scala/scommons/client/ui/tab/TabPanelSpec.scala +++ b/ui/src/test/scala/scommons/client/ui/tab/TabPanelSpec.scala @@ -26,7 +26,7 @@ class TabPanelSpec extends TestSpec with TestRendererUtils { tabs.length shouldBe items.size tabs(props.selectedIndex).props.className shouldBe "active" val panels = findComponents(comp, <.div.name).filter { - case c if c.props.className.asInstanceOf[js.Any] == js.undefined => false + case c if c.props.className.asInstanceOf[js.UndefOr[String]].isEmpty => false case c => c.props.className.asInstanceOf[String].contains("tab-pane") } panels.length shouldBe items.size diff --git a/ui/src/test/scala/scommons/client/ui/tree/BrowseTreeSpec.scala b/ui/src/test/scala/scommons/client/ui/tree/BrowseTreeSpec.scala index d0fd8d0..96bbb6b 100644 --- a/ui/src/test/scala/scommons/client/ui/tree/BrowseTreeSpec.scala +++ b/ui/src/test/scala/scommons/client/ui/tree/BrowseTreeSpec.scala @@ -42,7 +42,7 @@ class BrowseTreeSpec extends TestSpec with TestRendererUtils { props.selectedItem.map(_.prefix) shouldBe Some(data.path.prefix) //then - onSelect.expects(_: BrowseTreeData).never() + onSelect.expects(*).never() //when nodeProps.onSelect.get()