Skip to content

Commit e437997

Browse files
committed
drop Scala 2.10 support
fixes #118
1 parent bede478 commit e437997

File tree

4 files changed

+7
-33
lines changed

4 files changed

+7
-33
lines changed

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ jdk:
1414
- oraclejdk8
1515

1616
env:
17-
- SCALA_VERSION=2.10.2
18-
- SCALA_VERSION=2.10.3
19-
- SCALA_VERSION=2.10.4
20-
- SCALA_VERSION=2.10.5
21-
- SCALA_VERSION=2.10.6
2217
- SCALA_VERSION=2.11.0
2318
- SCALA_VERSION=2.11.1
2419
- SCALA_VERSION=2.11.2

build.sbt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,18 @@ lazy val defaults = Seq(
5050
organization := "com.typesafe.genjavadoc",
5151
scalaVersion := crossScalaVersions.value.last,
5252
crossScalaVersions := {
53-
val latest210 = 6
5453
val latest211 = 11
5554
val latest212 = 3
5655
val pre213 = List("M2")
5756
val skipVersions = Set("2.11.9", "2.11.10")
58-
val scala210and211Versions = (2 to latest210).map(i => s"2.10.$i") ++ (0 to latest211).map(i => s"2.11.$i")
59-
.filterNot(skipVersions.contains(_))
57+
val scala211Versions =
58+
(0 to latest211)
59+
.map(i => s"2.11.$i")
60+
.filterNot(skipVersions.contains(_))
6061
ifJavaVersion(_ < 8) {
61-
scala210and211Versions
62+
scala211Versions
6263
} {
63-
scala210and211Versions ++ (0 to latest212).map(i => s"2.12.$i") ++ pre213.map(s => s"2.13.0-$s")
64+
scala211Versions ++ (0 to latest212).map(i => s"2.12.$i") ++ pre213.map(s => s"2.13.0-$s")
6465
}
6566
},
6667
scalaTestVersion := {

plugin/src/main/scala-2.10/com/typesafe/genjavadoc/Comments.scala

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

plugin/src/main/scala/com/typesafe/genjavadoc/Plugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class GenJavaDocPlugin(val global: Global) extends Plugin {
5757

5858
val isPreFields = {
5959
val v = nsc.Properties.versionNumberString
60-
Set("2.12.0-M1", "2.12.0-M2", "2.12.0-M3", "2.12.0-M4", "2.12.0-M5").contains(v) || v.startsWith("2.10.") || v.startsWith("2.11.")
60+
Set("2.12.0-M1", "2.12.0-M2", "2.12.0-M3", "2.12.0-M4", "2.12.0-M5").contains(v) || v.startsWith("2.11.")
6161
}
6262
override val runsAfter = List(if(isPreFields) "uncurry" else "fields")
6363
val phaseName = "GenJavaDoc"

0 commit comments

Comments
 (0)