From f29670b1f590c1fc606851887f00e23c269350b0 Mon Sep 17 00:00:00 2001 From: Viktor Podzigun Date: Wed, 22 Dec 2021 12:10:06 +0100 Subject: [PATCH] Drop support for scala.js 0.6.x / scala 2.12.x, fixed #2 --- .travis.yml | 12 +++--------- README.md | 17 ++++++++--------- build.sbt | 4 +--- project/plugins.sbt | 11 ++--------- version.sbt | 2 +- 5 files changed, 15 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1a35dc..06529b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,18 +7,12 @@ branches: only: - master - /^v\d+\.\d+\.\d+$/ -scala: - - 2.12.2 - - 2.13.1 env: global: - TRAVIS_SBT_VERSION="1.2.8" - secure: S9TAeXE7pKYoszKlmgT7E9s09SRrpv7QrbNfpC5nEgsaAtTrrfgglosmjkJ4GokZ4YKvFPYGRiNhN/ntp/yFej+yzXMnkNn0tvvaH6GkUyEsV9NypPS7Yyev85R5WNiZgsefBBiy4cschUhVlOzUpfnBKPkCazr5LxYbf6A0SWOpQTj3mhvfl2oHEGJ2QZxhd0Xy2+jUYjhSXo24HHON0A3xAxVIf1LE0rKY9u4um5puymD66RYkNaBv5QnSyUt4fh2A6jF3QRikxONI0w867s8EGxR3dSVtAqP0u8h/vYIsqnwrHyyZU9AB4/crBbpx73xHOyA5DwMHQsgFsCCFGN+od52F+tFA4kxkwdZRlhZ8yXOURAy1wvcx/wacWzJZbHIvjtX4ZmUgoUM31WQB5OPC5lbvB2gJtoktocy/hz3q9RRda3gkIBIQ69p4H3ypAkEN6Fxs0/BJ4096xuzcRYp60uksIEc9DH+GcobZ1nm8XONEF8fad78G+RiFnvwr3UzWH0buzMw2pEx1ksn3PGOWQrglCU6wY1WwqSH/3HFeWQrEtcfE1It7pr47UNTFFP3H4A4X9er17WKCTm86wb2Zi1QVB5y1R5lYQ3TuIQK84IPp1LcYQtHEfQips+y8vMlKV1FShfV/+H5NLPOPHEZNBKsBcRy41uHCYIBZ3co= - secure: OwPfZspwerhelAZIL0RoH1DCHRCpfMONKw4n2ngRutckuzMXL7PC2FMuMTZOlZNAGu26bBEuixFqQNP4roPppe6U/ZTyr/BE84PJwWKkStTyMTWCTQPAwQkRyUZkLStgjEdSL2kAAe8kvJtJ0NPau+RlSL6T789J2T2tFfnCO7hb/cCnGtD2rUPgswos4wVgPebAHVOltBCcw+TKZDbMoxFlPXqdZRuYgBvWrAX9LDI1VbLS7o+Pq6/0jy9NpPyX3V1BVNPof4bQPDypi+Kv6c0nlcO40tSRjk9t7/7pj7OobonLFdykyvB1MFRKx7dKLWgSK0XhGWJdVAMZ0tPH4PlBAp9fZzXntIj7n9P65kizFFPN9WiDEkCGg1GLdMLdMMUpokTYfkamFaoYFvjHQetCZrGCFx3MOdu39+fYsy5XDvLbFV8FDDqH3w9BkcJQUmD4Wd+iYBqb3j8LU+qxguGE+eN1IFMqqEe1rfF2+QcBrbmXCY6yqqPaIIRhNpE3jrh0rCMoxcnIVIFqwACT4yTRWMz5p6mPUVrxIKAGz0vTFYkuR9v72yDw3MGtw4me1X1RRQyM0MvZphzKYRWCxmDGn0S/LG/8GLMrOmAvX6QK1PrigIfLRQtDNyPvivhg6d8X5rL1Q+F2Y7nkDx77CZX/CsMskTrLnjfRx2BuvQQ= - secure: GoTlvDux+PjwBLF2ag7JRNptyORIfZAqR03LM9NMJIuoUh1e2BSSI1ABNZRv0EyR6qDwIiNfDwaq4wgJhbBQavVyy19/lv/x79Rjq2bXxKOZJs3iNHAvSpE71tf/H9H4xQ/slNv1v6W6XGajpXffg2+P4DvHeriivGmxvT3Y3HlkQrFhNnk3ODD9JS5YAnrtveiBcdDgNTcA9Th30+BbZb2VJb/wKmsu+qDVDKcsZrAg0jrhT4mU2u3VnxeSetq6dDPFvZ+2vFqp0n7XfszV1ZV0Omy0D4R0K8ABbJTGxcgsigREfRDRebsXQySRVA4F5nFJv784wTfQHwy9f9WIznpIkrVbDMREoT4zxCF9XdXdMpPHh/DlKLuXZ/iCntARoIF1dkNAq2P2mP4Gbye6FTAsmn5wLYqXWUvKIWlaMUOy9xzChj/B8jlmXWJjP4etpkwTeYvV+wOZFQna/fugOYpZKyu4JLkhqGkk+7f3TL1zfIBfpeZpSpiisT+el1JL4otr7AXTYTQFqWZbwHtPhkeYj4VxyxlyZQ04guEf2KgSa0ogQS7CJjMLdMwz1qVFpY0lodPZpsBFgpF3dlB8A2MfhnxF/ZGvxZUa6GnhaTalbFTFVZZRf2ULI9w0OHlkOWLQrdM83rIDN/ZR3yhjAqrpLrfh5HbhsUsFxOUVV5I= - jobs: - - SCALAJS_VERSION=0.6.31 - - SCALAJS_VERSION=1.1.0 addons: chrome: stable apt: @@ -39,14 +33,14 @@ before_script: - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start script: -- sbt ++$TRAVIS_SCALA_VERSION fastOptJS::webpack it:test && +- sbt fastOptJS::webpack it:test && if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" -o "$TRAVIS_BRANCH" == "$TRAVIS_TAG" ]; then if [ -z "$TRAVIS_TAG" ]; then echo "Publish a snapshot"; - sbt ++$TRAVIS_SCALA_VERSION clean publish; + sbt clean publish; else echo "Publish a release version=$TRAVIS_TAG"; - version=$TRAVIS_TAG sbt ++$TRAVIS_SCALA_VERSION clean publishSigned sonatypeBundleRelease; + version=$TRAVIS_TAG sbt clean publishSigned sonatypeBundleRelease; fi else echo "This is not a master branch commit. Skipping the publish/release step"; diff --git a/README.md b/README.md index a887eea..764359c 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,12 @@ # scalajs-reactjs [![Build Status](https://travis-ci.com/scommons/scalajs-reactjs.svg?branch=master)](https://travis-ci.com/scommons/scalajs-reactjs) -[![scala-index](https://index.scala-lang.org/scommons/scalajs-reactjs/scalajs-reactjs-core/latest-by-scala-version.svg?targetType=Js)](https://index.scala-lang.org/scommons/scalajs-reactjs/scalajs-reactjs-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/scalajs-reactjs/scalajs-reactjs-core/latest.svg)](https://index.scala-lang.org/scommons/scalajs-reactjs/scalajs-reactjs-core) +[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.1.0.svg)](https://www.scala-js.org) Develop React applications with Scala. -It is compatible with Scala `2.12`, `2.13`, Scala.js `0.6.29`, `1.1.0` and with React.js `v17+`. +It is compatible with Scala `2.13+`, Scala.js `1.1+` and with React.js `v17+`. Optionally include `react-router` and `react-redux` facades, too. @@ -45,12 +44,12 @@ ReactDOM.render(<.div(^.id := "hello-world")("Hello, World!"), mountNode) 2. Depend on the libraries. ``` libraryDependencies ++= Seq( - "org.scommons.shogowada" %%% "scalajs-reactjs-core" % "0.17.0", // For react facade - "org.scommons.shogowada" %%% "scalajs-reactjs-dom" % "0.17.0", // For react-dom facade + "org.scommons.shogowada" %%% "scalajs-reactjs-core" % "0.17.1", // For react facade + "org.scommons.shogowada" %%% "scalajs-reactjs-dom" % "0.17.1", // For react-dom facade - "org.scommons.shogowada" %%% "scalajs-reactjs-router-dom" % "0.17.0", // Optional. For react-router-dom facade - "org.scommons.shogowada" %%% "scalajs-reactjs-redux" % "0.17.0", // Optional. For react-redux facade - "org.scommons.shogowada" %%% "scalajs-reactjs-redux-devtools" % "0.17.0" // Optional. For redux-devtools facade + "org.scommons.shogowada" %%% "scalajs-reactjs-router-dom" % "0.17.1", // Optional. For react-router-dom facade + "org.scommons.shogowada" %%% "scalajs-reactjs-redux" % "0.17.1", // Optional. For react-redux facade + "org.scommons.shogowada" %%% "scalajs-reactjs-redux-devtools" % "0.17.1" // Optional. For redux-devtools facade ) ``` diff --git a/build.sbt b/build.sbt index 78865aa..d47d0c9 100644 --- a/build.sbt +++ b/build.sbt @@ -10,8 +10,7 @@ val StaticTagsVersion = "2.7.0" val commonSettings = Seq( organization := "org.scommons.shogowada", - crossScalaVersions := Seq("2.12.2", "2.13.1"), - scalaVersion := "2.12.2", + scalaVersion := "2.13.1", scalacOptions ++= Seq( "-deprecation", "-unchecked", "-feature", "-Xcheckinit", "-target:jvm-1.8", "-Xfatal-warnings" ), @@ -57,7 +56,6 @@ val commonSettings = Seq( lazy val root = (project in file(".")) .settings(commonSettings: _*) .settings( - crossScalaVersions := Nil, //must be set to Nil on the aggregating project skip in publish := true, publish := ((): Unit), publishLocal := ((): Unit), diff --git a/project/plugins.sbt b/project/plugins.sbt index 927cc2e..da43a8d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,15 +1,8 @@ -val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.1.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) -if (scalaJSVersion.startsWith("1.")) { - addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.18.0") -} -else { - addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-sjs06" % "0.18.0") -} +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.18.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") diff --git a/version.sbt b/version.sbt index 9861198..ed7e02d 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := sys.env.getOrElse("version", default = "0.17.0-SNAPSHOT").stripPrefix("v") +version in ThisBuild := sys.env.getOrElse("version", default = "0.17.1-SNAPSHOT").stripPrefix("v")