Skip to content

Commit

Permalink
Upgraded Scala version to 2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
viktor-podzigun committed Jul 23, 2021
1 parent cf35d5d commit bca6d1f
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 16 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
4 changes: 2 additions & 2 deletions project/src/main/scala/common/Libs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions script/docs_gen_assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
8 changes: 4 additions & 4 deletions showcase/index.dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="../assets/src/main/public/css/bootstrap-responsive.min.css" />
<link rel="stylesheet" href="../assets/src/main/public/css/custom.css" />

<link rel="stylesheet" href="./target/scala-2.12/scalajs-bundler/main/styles/scommons-client-showcase-fastopt.css" />
<link rel="stylesheet" href="./target/scala-2.13/scalajs-bundler/main/styles/scommons-client-showcase-fastopt.css" />

<script type="text/javascript">
scommons = {
Expand All @@ -21,8 +21,8 @@
<body>
<div id="root">Loading, please, wait...</div>

<script src="./target/scala-2.12/scalajs-bundler/main/scommons-client-showcase-fastopt-library.js"></script>
<script src="./target/scala-2.12/scalajs-bundler/main/scommons-client-showcase-fastopt-loader.js"></script>
<script src="./target/scala-2.12/scalajs-bundler/main/scommons-client-showcase-fastopt.js"></script>
<script src="./target/scala-2.13/scalajs-bundler/main/scommons-client-showcase-fastopt-library.js"></script>
<script src="./target/scala-2.13/scalajs-bundler/main/scommons-client-showcase-fastopt-loader.js"></script>
<script src="./target/scala-2.13/scalajs-bundler/main/scommons-client-showcase-fastopt.js"></script>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit bca6d1f

Please sign in to comment.