Global cleanup change.

--
MOS_MIGRATED_REVID=125449526

2 files changed, 10 insertions, 7 deletions

diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerBaseModule.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerBaseModule.java
index c6742324a3..2da89af2bd 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerBaseModule.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerBaseModule.java
@@ -15,7 +15,6 @@
 package com.google.testing.junit.runner.junit4;
 
 import static com.google.testing.junit.runner.sharding.ShardingFilters.DEFAULT_SHARDING_STRATEGY;
-import static dagger.Provides.Type.SET;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
@@ -28,6 +27,7 @@ import com.google.testing.junit.runner.sharding.api.ShardingFilterFactory;
 import dagger.Module;
 import dagger.Multibindings;
 import dagger.Provides;
+import dagger.multibindings.IntoSet;
 
 import org.junit.internal.TextListener;
 import org.junit.runner.Request;
@@ -60,7 +60,8 @@ public final class JUnit4RunnerBaseModule {
     return DEFAULT_SHARDING_STRATEGY;
   }
 
-  @Provides(type = SET)
+  @Provides
+  @IntoSet
   static RunListener textListener(TextListener impl) {
     return impl;
   }
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java
index 91cfd1d875..4b895cd7fd 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java
@@ -14,8 +14,6 @@
 
 package com.google.testing.junit.runner.junit4;
 
-import static dagger.Provides.Type.SET;
-
 import com.google.common.base.Optional;
 import com.google.common.base.Ticker;
 import com.google.common.io.ByteStreams;
@@ -24,6 +22,7 @@ import com.google.testing.junit.runner.util.TestNameProvider;
 
 import dagger.Module;
 import dagger.Provides;
+import dagger.multibindings.IntoSet;
 
 import org.junit.runner.notification.RunListener;
 
@@ -49,17 +48,20 @@ public final class JUnit4RunnerModule {
     return SignalHandlers.createRealHandlerInstaller();
   }
 
-  @Provides(type = SET)
+  @Provides
+  @IntoSet
   static RunListener nameListener(JUnit4TestNameListener impl) {
     return impl;
   }
 
-  @Provides(type = SET)
+  @Provides
+  @IntoSet
   static RunListener xmlListener(JUnit4TestXmlListener impl) {
     return impl;
   }
 
-  @Provides(type = SET)
+  @Provides
+  @IntoSet
   static RunListener stackTraceListener(JUnit4TestStackTraceListener impl) {
     return impl;
   }