Skip to content

Commit e2f74f7

Browse files
authored
Merge pull request #29 from sideeffffect/drop-scala-2.10
Drop support for Scala 2.10
2 parents 304fe9c + c00cd11 commit e2f74f7

File tree

6 files changed

+3
-31
lines changed

6 files changed

+3
-31
lines changed

.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: scala
22

33
scala:
4-
- 2.10.7
54
- 2.11.12
65
- 2.12.10
76
- 2.13.1
@@ -13,12 +12,6 @@ env:
1312
- SCALAJS_VERSION=0.6.28
1413
- SCALAJS_VERSION=1.0.0
1514

16-
matrix:
17-
exclude:
18-
# 2.10 is not supported in Scala.js 1.x
19-
- scala: 2.10.7
20-
env: SCALAJS_VERSION=1.0.0
21-
2215
script:
2316
- |
2417
if [ "$SCALAJS_VERSION" = "" ]; then

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ libraryDependencies += "org.portable-scala" %%% "portable-scala-reflect" % "1.0.
2222

2323
`portable-scala-reflect` 1.0.0 supports:
2424

25-
* Scala 2.10.x, 2.11.x, 2.12.x and 2.13.x
25+
* Scala 2.11.x, 2.12.x and 2.13.x
2626
* Scala/JVM
2727
* Scala.js 0.6.x and 1.x
2828

build.sbt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import sbtcrossproject.{crossProject, CrossType}
44
val previousVersion = "1.0.0"
55

66
inThisBuild(Def.settings(
7-
crossScalaVersions := Seq("2.12.10", "2.10.7", "2.11.12", "2.13.1"),
7+
crossScalaVersions := Seq("2.12.10", "2.11.12", "2.13.1"),
88
scalaVersion := crossScalaVersions.value.head,
9-
version := "1.0.1-SNAPSHOT",
9+
version := "1.1.0-SNAPSHOT",
1010
organization := "org.portable-scala",
1111

1212
scalacOptions ++= Seq(
@@ -73,9 +73,3 @@ 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-
)

js/src/test/scala/org/portablescala/reflect/TestPlatform.scala

Lines changed: 0 additions & 5 deletions
This file was deleted.

jvm/src/test/scala/org/portablescala/reflect/TestPlatform.scala

Lines changed: 0 additions & 6 deletions
This file was deleted.

shared/src/test/scala/org/portablescala/reflect/ReflectTest.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,6 @@ class ReflectTest {
237237
assertCannotFind(
238238
classOf[LocalClassWithEnableReflectiveInstantiationInsideMethod])
239239

240-
assumeFalse(
241-
"Scala/JVM 2.10.x does not correctly configure classes in lambdas as local",
242-
TestPlatform.isScala210OnJVM)
243-
244240
// In a lambda whose owner is ultimately the constructor of the class
245241
assertCannotFind(classInsideLambdaInsideCtor())
246242

0 commit comments

Comments
 (0)