From 95bb1962e9e63b34b2c0dbab68c867ce252838c1 Mon Sep 17 00:00:00 2001 From: Viktor Podzigun Date: Mon, 23 Aug 2021 13:14:50 +0200 Subject: [PATCH] Revert "Drop support for scala.js 0.6.x, fixed #2" This reverts commit ee0d0c47 --- .travis.yml | 3 +++ README.md | 3 ++- project/plugins.sbt | 12 ++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index abe9238..997cc4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,9 @@ env: - 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: diff --git a/README.md b/README.md index 035c7ae..aa0d5bc 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,12 @@ [![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/latest.svg)](https://index.scala-lang.org/scommons/scalajs-reactjs/scalajs-reactjs) +[![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) Develop React applications with Scala. -It is compatible with Scala `2.12`, `2.13` and Scala.js `1.1.0`. +It is compatible with Scala `2.12`, `2.13` and Scala.js `0.6.29`, `1.1.0` Optionally include `react-router` and `react-redux` facades, too. diff --git a/project/plugins.sbt b/project/plugins.sbt index 4452468..927cc2e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,15 @@ +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" % "1.1.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) -addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.18.0") +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.xerial.sbt" % "sbt-sonatype" % "3.9.5") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")