Skip to content

Commit 00f0ebd

Browse files
authored
Merge pull request #17 from sjrd/scalajs-1.0.0
Upgrade to Scala.js 1.0.0, and make it the default.
2 parents 4cd24b9 + a724a4c commit 00f0ebd

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@ env:
1111
matrix:
1212
- SCALAJS_VERSION=
1313
- SCALAJS_VERSION=0.6.28
14-
- SCALAJS_VERSION=1.0.0-M8
15-
- SCALAJS_VERSION=1.0.0-RC2
14+
- SCALAJS_VERSION=1.0.0
1615

1716
matrix:
1817
exclude:
1918
# 2.10 is not supported in Scala.js 1.x
2019
- scala: 2.10.7
21-
env: SCALAJS_VERSION=1.0.0-M8
22-
- scala: 2.10.7
23-
env: SCALAJS_VERSION=1.0.0-RC2
20+
env: SCALAJS_VERSION=1.0.0
2421

2522
script:
2623
- |

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# portable-scala-reflect: platform-agnostic reflection for Scala
22

3+
[![Build Status](https://travis-ci.org/portable-scala/portable-scala-reflect.svg?branch=master)](https://travis-ci.org/portable-scala/portable-scala-reflect)
4+
[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-0.6.29.svg)](https://www.scala-js.org/)
5+
[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0.svg)](https://www.scala-js.org)
6+
37
The various platforms supported by Scala (JVM, JavaScript and Native) have varying support for run-time reflection.
48
Even the subset of functionality that is supported across the platforms is exposed through different APIs.
59

@@ -19,7 +23,7 @@ libraryDependencies += "org.portable-scala" %%% "portable-scala-reflect" % "0.1.
1923

2024
* Scala 2.10.x, 2.11.x, 2.12.x and 2.13.x
2125
* Scala/JVM
22-
* Scala.js 0.6.x, 1.0.0-M8 and 1.0.0-RC1 (with further 1.x RCs and final expected)
26+
* Scala.js 0.6.x and 1.x
2327

2428
## Usage
2529

build.sbt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,9 @@ lazy val `portable-scala-reflect` = crossProject(JSPlatform, JVMPlatform)
7373
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
7474
)
7575
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
76+
.jsSettings(
77+
crossScalaVersions ~= { prev =>
78+
if (scalaJSVersion.startsWith("0.6.")) prev
79+
else prev.filter(v => !v.startsWith("2.10."))
80+
}
81+
)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("0.6.28")
2+
Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("1.0.0")
33

44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
55
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

0 commit comments

Comments
 (0)