Merge pull request #12 from sjrd/upgrades

Upgrades.

Author: gzm0

.travis.yml

@@ -3,21 +3,21 @@ language: scala
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.6
-  - 2.13.0-M4
+  - 2.12.8
+  - 2.13.0
 jdk:
   - oraclejdk8
 env:
   matrix:
     - SCALAJS_VERSION=
-    - SCALAJS_VERSION=0.6.23
-    - SCALAJS_VERSION=1.0.0-M5
+    - SCALAJS_VERSION=0.6.28
+    - SCALAJS_VERSION=1.0.0-M8
 
 matrix:
   exclude:
     # 2.10 is not supported in Scala.js 1.x
     - scala: 2.10.7
-      env: SCALAJS_VERSION=1.0.0-M5
+      env: SCALAJS_VERSION=1.0.0-M8
 
 script:
   - |

build.sbt

@@ -4,8 +4,8 @@ import sbtcrossproject.{crossProject, CrossType}
 val previousVersion = "0.1.0"
 
 inThisBuild(Def.settings(
-  crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6"),
-  scalaVersion := crossScalaVersions.value.last,
+  crossScalaVersions := Seq("2.12.8", "2.10.7", "2.11.12", "2.13.0"),
+  scalaVersion := crossScalaVersions.value.head,
   version := "0.1.1-SNAPSHOT",
   organization := "org.portable-scala",
 

jvm/src/main/scala/org/portablescala/reflect/Reflect.scala

@@ -206,7 +206,7 @@ object Reflect {
       if (clazz.getAnnotation(classOf[EnableReflectiveInstantiation]) != null) {
         true
       } else {
-        (Iterator(clazz.getSuperclass) ++ Iterator(clazz.getInterfaces: _*))
+        (Iterator(clazz.getSuperclass) ++ clazz.getInterfaces.iterator)
           .filter(_ != null)
           .exists(c)
       }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.1
+sbt.version=1.2.8

project/plugins.sbt

@@ -1,5 +1,5 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("0.6.23")
+  Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("0.6.28")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

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

@@ -319,10 +319,11 @@ class ReflectTest {
 
   @Test def testLocalClassWithReflectiveInstantiationInLambda_issue_3227(): Unit = {
     // Test that the presence of the following code does not prevent linking
-    { () =>
+    val f = { () =>
       @EnableReflectiveInstantiation
       class Foo
     }
+    identity(f) // discard f without compiler warning
   }
 }