diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-06 17:56:28 +0100 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-06 17:56:28 +0100 |
commit | e1402ed460f1adb73b8f0f6bc97ea3b19b72c4be (patch) | |
tree | 73f9210df3fdbbb6601641f7c0a7bbaeb67e5806 | |
parent | fa02c15d7033714f94cc8510a3a505d60668bf66 (diff) | |
parent | e8cca3c275f902f7b5db7771385cfe8d2234356c (diff) | |
download | scala-e1402ed460f1adb73b8f0f6bc97ea3b19b72c4be.tar.gz scala-e1402ed460f1adb73b8f0f6bc97ea3b19b72c4be.tar.bz2 scala-e1402ed460f1adb73b8f0f6bc97ea3b19b72c4be.zip |
Merge pull request #3474 from soc/topic/osgi-feature-warnings
Fix feature warnings in test.osgi.comp
-rw-r--r-- | test/osgi/src/BasicReflection.scala | 2 | ||||
-rw-r--r-- | test/osgi/src/ScalaOsgiHelper.scala | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/osgi/src/BasicReflection.scala b/test/osgi/src/BasicReflection.scala index 68fedb7c83..d601f04f89 100644 --- a/test/osgi/src/BasicReflection.scala +++ b/test/osgi/src/BasicReflection.scala @@ -2,6 +2,8 @@ package tools.test.osgi package reflection package basic +import scala.language.higherKinds + import org.junit.Assert._ import org.ops4j.pax.exam.CoreOptions._ diff --git a/test/osgi/src/ScalaOsgiHelper.scala b/test/osgi/src/ScalaOsgiHelper.scala index 7b14cf20e8..084afe8643 100644 --- a/test/osgi/src/ScalaOsgiHelper.scala +++ b/test/osgi/src/ScalaOsgiHelper.scala @@ -1,5 +1,5 @@ package tools.test.osgi - + import org.ops4j.pax.exam.CoreOptions._ import org.ops4j.pax.exam import java.io.File @@ -12,7 +12,7 @@ trait ScalaOsgiHelper { } private def filteredBundleFiles(names: String*): Array[exam.Option] = - for(bundle <- allBundleFiles; if names exists (bundle.getName contains)) + for(bundle <- allBundleFiles; if names exists (bundle.getName contains _)) yield makeBundle(bundle) private def makeBundle(file: File): exam.Option = @@ -34,5 +34,5 @@ trait ScalaOsgiHelper { val bundles = filteredBundleFiles("scala-library") bundles ++ Array[exam.Option](felix(), equinox(), junitBundles()) } - + } |