Skip to content

Commit 2bc528f

Browse files
authored
Merge pull request #314 from SethTisue/scalajs-1.0.1
bump Scala.js to 1.0.1, Scala to 2.12.11
2 parents b2334d9 + 5e24001 commit 2bc528f

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@ language: scala
66

77
scala:
88
- 2.11.12
9-
- 2.12.10
9+
- 2.12.11
1010
- 2.13.1
1111

1212
env:
1313
- SCALAJS_VERSION= ADOPTOPENJDK=8
1414
- SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8
15-
- SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8
15+
- SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8
1616
- SCALAJS_VERSION= ADOPTOPENJDK=11
1717
- SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=11
18-
- SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=11
18+
- SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=11
1919

2020
matrix:
2121

2222
include:
2323

2424
# run migration test
25-
- scala: 2.12.10
25+
- scala: 2.12.11
2626
env: TEST_SCALAFIX=true ADOPTOPENJDK=8
2727

2828
# run binary compatibility test
29-
- scala: 2.12.10
29+
- scala: 2.12.11
3030
env: TEST_BINARY_COMPAT=true ADOPTOPENJDK=8
3131

3232
# run scalafmt
33-
- scala: 2.12.10
33+
- scala: 2.12.11
3434
env: TEST_SCALAFMT=true ADOPTOPENJDK=8
3535

3636
# Scala Native includes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The library also adds backported versions of new collection types, currently `sc
3939

4040
## Migration Tool
4141

42-
The migration rules use scalafix. Please see the [official installation instruction](https://scalacenter.github.io/scalafix/docs/users/installation.html) and, in particular, check that your full Scala version is supported (ex 2.12.10).
42+
The migration rules use scalafix. Please see the [official installation instruction](https://scalacenter.github.io/scalafix/docs/users/installation.html) and, in particular, check that your full Scala version is supported (ex 2.12.11).
4343

4444
```scala
4545
// project/plugins.sbt

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ lazy val root = project
4747
lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
4848

4949
lazy val scala211 = "2.11.12"
50-
lazy val scala212 = "2.12.10"
50+
lazy val scala212 = "2.12.11"
5151
lazy val scala213 = "2.13.1"
5252

5353
/** Create an OSGi version range for standard Scala versioning

project/MultiScalaProject.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import java.io.File
2222
*
2323
* // instanciate a sbt project
2424
* lazy val myProject211 = myProject("2.11.12", _.settings(...) /* scala version dependent configurations */)
25-
* lazy val myProject212 = myProject("2.12.10" , _.settings(...))
25+
* lazy val myProject212 = myProject("2.12.11" , _.settings(...))
2626
* // ...
2727
* }}}
2828
*/

0 commit comments

Comments
 (0)