diff --git a/build.sbt b/build.sbt index de6f7fbf..fed1abcf 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ lazy val examples = project in file("examples") dependsOn (root % "test->test;co ) ) -scalacOptions in ThisBuild := Seq("-feature", "-unchecked", "-deprecation", "-encoding", "utf8") +scalacOptions in ThisBuild := Seq("-feature", "-unchecked", "-deprecation", "-encoding", "utf8", "-Xfatal-warnings") scalaVersion in ThisBuild := "2.11.6" diff --git a/project/build.properties b/project/build.properties index 64abd373..a6e117b6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.6 +sbt.version=0.13.8 diff --git a/src/test/scala/rx/lang/scala/completeness/BlockingObservableCompletenessKit.scala b/src/test/scala-2.11/rx/lang/scala/completeness/BlockingObservableCompletenessKit.scala similarity index 100% rename from src/test/scala/rx/lang/scala/completeness/BlockingObservableCompletenessKit.scala rename to src/test/scala-2.11/rx/lang/scala/completeness/BlockingObservableCompletenessKit.scala diff --git a/src/test/scala/rx/lang/scala/completeness/CompletenessKit.scala b/src/test/scala-2.11/rx/lang/scala/completeness/CompletenessKit.scala similarity index 96% rename from src/test/scala/rx/lang/scala/completeness/CompletenessKit.scala rename to src/test/scala-2.11/rx/lang/scala/completeness/CompletenessKit.scala index 82532022..986520c1 100644 --- a/src/test/scala/rx/lang/scala/completeness/CompletenessKit.scala +++ b/src/test/scala-2.11/rx/lang/scala/completeness/CompletenessKit.scala @@ -79,7 +79,7 @@ trait CompletenessKit extends JUnitSuite { for (member <- members; alt <- member.asTerm.alternatives) yield { val m = alt.asMethod // multiple parameter lists in case of curried functions - val paramListStrs = for (paramList <- m.paramss) yield { + val paramListStrs = for (paramList <- m.paramLists) yield { paramList.map( symb => removePackage(symb.typeSignature.toString.replaceAll(",(\\S)", ", $1")) ).mkString("(", ", ", ")") @@ -94,7 +94,7 @@ trait CompletenessKit extends JUnitSuite { val superTypes = tp.baseClasses.map(_.asType.toType).filter(!ignoredSuperTypes(_)) // declarations: => only those declared in // members => also those of superclasses - methodMembersToMethodStrings(superTypes.flatMap(_.declarations).filter { + methodMembersToMethodStrings(superTypes.flatMap(_.decls).filter { m => m.isMethod && m.isPublic && m.annotations.forall(_.toString != "java.lang.Deprecated") // don't check deprecated classes @@ -113,7 +113,7 @@ trait CompletenessKit extends JUnitSuite { */ private def getPublicInstanceAndCompanionMethods(tp: Type): Iterable[String] = getPublicInstanceMethods(tp) ++ - getPublicInstanceMethods(tp.typeSymbol.companionSymbol.typeSignature) + getPublicInstanceMethods(tp.typeSymbol.companion.typeSignature) private def javaMethodSignatureToScala(s: String): String = { val r = s.replaceAllLiterally("Long, Long, TimeUnit", "Duration, Duration") @@ -206,12 +206,12 @@ trait CompletenessKit extends JUnitSuite { @Ignore // because spams output @Test def printJavaStaticMethods(): Unit = { - printMethodSet(s"Static methods of $rxJavaType", rxJavaType.typeSymbol.companionSymbol.typeSignature) + printMethodSet(s"Static methods of $rxJavaType", rxJavaType.typeSymbol.companion.typeSignature) } @Ignore // because spams output @Test def printScalaCompanionMethods(): Unit = { - printMethodSet(s"Companion methods of $rxScalaType", rxScalaType.typeSymbol.companionSymbol.typeSignature) + printMethodSet(s"Companion methods of $rxScalaType", rxScalaType.typeSymbol.companion.typeSignature) } @Ignore // because spams output diff --git a/src/test/scala/rx/lang/scala/completeness/CompletenessTables.scala b/src/test/scala-2.11/rx/lang/scala/completeness/CompletenessTables.scala similarity index 100% rename from src/test/scala/rx/lang/scala/completeness/CompletenessTables.scala rename to src/test/scala-2.11/rx/lang/scala/completeness/CompletenessTables.scala diff --git a/src/test/scala/rx/lang/scala/completeness/ObservableCompletenessKit.scala b/src/test/scala-2.11/rx/lang/scala/completeness/ObservableCompletenessKit.scala similarity index 100% rename from src/test/scala/rx/lang/scala/completeness/ObservableCompletenessKit.scala rename to src/test/scala-2.11/rx/lang/scala/completeness/ObservableCompletenessKit.scala diff --git a/src/test/scala/rx/lang/scala/completeness/TestSchedulerCompletenessKit.scala b/src/test/scala-2.11/rx/lang/scala/completeness/TestSchedulerCompletenessKit.scala similarity index 100% rename from src/test/scala/rx/lang/scala/completeness/TestSchedulerCompletenessKit.scala rename to src/test/scala-2.11/rx/lang/scala/completeness/TestSchedulerCompletenessKit.scala diff --git a/src/test/scala/rx/lang/scala/completeness/TestSubscriberCompletenessKit.scala b/src/test/scala-2.11/rx/lang/scala/completeness/TestSubscriberCompletenessKit.scala similarity index 100% rename from src/test/scala/rx/lang/scala/completeness/TestSubscriberCompletenessKit.scala rename to src/test/scala-2.11/rx/lang/scala/completeness/TestSubscriberCompletenessKit.scala