summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2016-08-31 09:08:50 +0200
committerGitHub <noreply@github.com>2016-08-31 09:08:50 +0200
commitc492ac6022300ced8b56f523db5d17872e91b4b2 (patch)
treefe35906dde25152ee8637cc75d291eeda62b5800
parent5e91aa563dca2ea6b2aba2b767994c06a0fb2a61 (diff)
parente280e173bf2d0254ea0b4b76caf3bbf7aa75a70b (diff)
downloadscala-c492ac6022300ced8b56f523db5d17872e91b4b2.tar.gz
scala-c492ac6022300ced8b56f523db5d17872e91b4b2.tar.bz2
scala-c492ac6022300ced8b56f523db5d17872e91b4b2.zip
Merge pull request #5370 from SethTisue/java-unchecked-warnings
sbt build: fix "unchecked" warnings when compiling Java code
-rw-r--r--build.sbt2
-rw-r--r--test/junit/scala/runtime/LambdaDeserializerTest.java1
-rw-r--r--test/junit/scala/tools/testing/ClearAfterClass.java1
3 files changed, 3 insertions, 1 deletions
diff --git a/build.sbt b/build.sbt
index b2a27bcc6f..4a8f349a59 100644
--- a/build.sbt
+++ b/build.sbt
@@ -133,7 +133,7 @@ lazy val commonSettings = clearSourceAndResourceDirectories ++ publishSettings +
// we always assume that Java classes are standalone and do not have any dependency
// on Scala classes
compileOrder := CompileOrder.JavaThenScala,
- javacOptions in Compile ++= Seq("-g", "-source", "1.8", "-target", "1.8"),
+ javacOptions in Compile ++= Seq("-g", "-source", "1.8", "-target", "1.8", "-Xlint:unchecked"),
// we don't want any unmanaged jars; as a reminder: unmanaged jar is a jar stored
// directly on the file system and it's not resolved through Ivy
// Ant's build stored unmanaged jars in `lib/` directory
diff --git a/test/junit/scala/runtime/LambdaDeserializerTest.java b/test/junit/scala/runtime/LambdaDeserializerTest.java
index 3ed1ae1365..4e9c5c8954 100644
--- a/test/junit/scala/runtime/LambdaDeserializerTest.java
+++ b/test/junit/scala/runtime/LambdaDeserializerTest.java
@@ -136,6 +136,7 @@ public final class LambdaDeserializerTest {
}
}
+ @SuppressWarnings("unchecked")
private <A> A deserizalizeLambdaCreatingAllowedMap(A f1, HashMap<String, MethodHandle> cache, MethodHandles.Lookup lookup) {
SerializedLambda serialized = writeReplace(f1);
HashMap<String, MethodHandle> allowed = createAllowedMap(lookup, serialized);
diff --git a/test/junit/scala/tools/testing/ClearAfterClass.java b/test/junit/scala/tools/testing/ClearAfterClass.java
index 95e170ec13..7f87f9a4d7 100644
--- a/test/junit/scala/tools/testing/ClearAfterClass.java
+++ b/test/junit/scala/tools/testing/ClearAfterClass.java
@@ -45,6 +45,7 @@ public class ClearAfterClass {
}
}
+ @SuppressWarnings("unchecked")
public <T> T cached(String key, scala.Function0<T> t) {
Map<String, Object> perClassCache = cache.get(getClass());
return (T) perClassCache.computeIfAbsent(key, s -> t.apply());