Skip to content

Commit c283757

Browse files
committed
Merge pull request #176 from zsxwing/fatal-warnings
Upgrade sbt to 0.13.8; move completeness package to scala-2.11; enable fatal-warnings
2 parents a6d959c + 3d6cfca commit c283757

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ lazy val examples = project in file("examples") dependsOn (root % "test->test;co
1010
)
1111
)
1212

13-
scalacOptions in ThisBuild := Seq("-feature", "-unchecked", "-deprecation", "-encoding", "utf8")
13+
scalacOptions in ThisBuild := Seq("-feature", "-unchecked", "-deprecation", "-encoding", "utf8", "-Xfatal-warnings")
1414

1515
scalaVersion in ThisBuild := "2.11.6"
1616

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.6
1+
sbt.version=0.13.8

src/test/scala/rx/lang/scala/completeness/BlockingObservableCompletenessKit.scala renamed to src/test/scala-2.11/rx/lang/scala/completeness/BlockingObservableCompletenessKit.scala

File renamed without changes.

src/test/scala/rx/lang/scala/completeness/CompletenessKit.scala renamed to src/test/scala-2.11/rx/lang/scala/completeness/CompletenessKit.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ trait CompletenessKit extends JUnitSuite {
7979
for (member <- members; alt <- member.asTerm.alternatives) yield {
8080
val m = alt.asMethod
8181
// multiple parameter lists in case of curried functions
82-
val paramListStrs = for (paramList <- m.paramss) yield {
82+
val paramListStrs = for (paramList <- m.paramLists) yield {
8383
paramList.map(
8484
symb => removePackage(symb.typeSignature.toString.replaceAll(",(\\S)", ", $1"))
8585
).mkString("(", ", ", ")")
@@ -94,7 +94,7 @@ trait CompletenessKit extends JUnitSuite {
9494
val superTypes = tp.baseClasses.map(_.asType.toType).filter(!ignoredSuperTypes(_))
9595
// declarations: => only those declared in
9696
// members => also those of superclasses
97-
methodMembersToMethodStrings(superTypes.flatMap(_.declarations).filter {
97+
methodMembersToMethodStrings(superTypes.flatMap(_.decls).filter {
9898
m =>
9999
m.isMethod && m.isPublic &&
100100
m.annotations.forall(_.toString != "java.lang.Deprecated") // don't check deprecated classes
@@ -113,7 +113,7 @@ trait CompletenessKit extends JUnitSuite {
113113
*/
114114
private def getPublicInstanceAndCompanionMethods(tp: Type): Iterable[String] =
115115
getPublicInstanceMethods(tp) ++
116-
getPublicInstanceMethods(tp.typeSymbol.companionSymbol.typeSignature)
116+
getPublicInstanceMethods(tp.typeSymbol.companion.typeSignature)
117117

118118
private def javaMethodSignatureToScala(s: String): String = {
119119
val r = s.replaceAllLiterally("Long, Long, TimeUnit", "Duration, Duration")
@@ -206,12 +206,12 @@ trait CompletenessKit extends JUnitSuite {
206206

207207
@Ignore // because spams output
208208
@Test def printJavaStaticMethods(): Unit = {
209-
printMethodSet(s"Static methods of $rxJavaType", rxJavaType.typeSymbol.companionSymbol.typeSignature)
209+
printMethodSet(s"Static methods of $rxJavaType", rxJavaType.typeSymbol.companion.typeSignature)
210210
}
211211

212212
@Ignore // because spams output
213213
@Test def printScalaCompanionMethods(): Unit = {
214-
printMethodSet(s"Companion methods of $rxScalaType", rxScalaType.typeSymbol.companionSymbol.typeSignature)
214+
printMethodSet(s"Companion methods of $rxScalaType", rxScalaType.typeSymbol.companion.typeSignature)
215215
}
216216

217217
@Ignore // because spams output

src/test/scala/rx/lang/scala/completeness/CompletenessTables.scala renamed to src/test/scala-2.11/rx/lang/scala/completeness/CompletenessTables.scala

File renamed without changes.

src/test/scala/rx/lang/scala/completeness/ObservableCompletenessKit.scala renamed to src/test/scala-2.11/rx/lang/scala/completeness/ObservableCompletenessKit.scala

File renamed without changes.

src/test/scala/rx/lang/scala/completeness/TestSchedulerCompletenessKit.scala renamed to src/test/scala-2.11/rx/lang/scala/completeness/TestSchedulerCompletenessKit.scala

File renamed without changes.

src/test/scala/rx/lang/scala/completeness/TestSubscriberCompletenessKit.scala renamed to src/test/scala-2.11/rx/lang/scala/completeness/TestSubscriberCompletenessKit.scala

File renamed without changes.

0 commit comments

Comments
 (0)