From 59f48e3859f186c810ae9425aeb2057bd02f858d Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Fri, 6 Nov 2020 15:47:30 +0000
Subject: [PATCH] Remove @JvmSuppressWildcards on multibindings

Guice now supports multibindings with wildcards, so the annotation is
now redundant.

Signed-off-by: Graham <gpe@openrs2.org>
---
 bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt          | 2 +-
 .../src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt     | 2 +-
 deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt           | 2 +-
 .../kotlin/org/openrs2/deob/transform/BundlerTransformer.kt     | 2 +-
 json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt   | 2 +-
 yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt b/bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt
index 77f59260..d0b0c4d6 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt
+++ b/bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt
@@ -24,7 +24,7 @@ import javax.inject.Singleton
 
 @Singleton
 public class Bundler @Inject constructor(
-    @BundlerQualifier private val transformers: Set<@JvmSuppressWildcards Transformer>,
+    @BundlerQualifier private val transformers: Set<Transformer>,
     private val config: Config
 ) {
     private val unsignedManifest = Manifest().apply {
diff --git a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt
index 05da0162..de3762f4 100644
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt
@@ -8,7 +8,7 @@ import javax.inject.Singleton
 
 @Singleton
 public class AstDeobfuscator @Inject constructor(
-    private val transformers: Set<@JvmSuppressWildcards Transformer>
+    private val transformers: Set<Transformer>
 ) {
     public fun run(modules: Set<Module>) {
         val group = LibraryGroup(modules.map(Library.Companion::parse))
diff --git a/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt b/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt
index 94fd0861..fd9fcd50 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt
+++ b/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt
@@ -16,7 +16,7 @@ import javax.inject.Singleton
 
 @Singleton
 public class Deobfuscator @Inject constructor(
-    @DeobfuscatorQualifier private val transformers: Set<@JvmSuppressWildcards Transformer>
+    @DeobfuscatorQualifier private val transformers: Set<Transformer>
 ) {
     public fun run(input: Path, output: Path) {
         // read input jars/packs
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/BundlerTransformer.kt b/deob/src/main/kotlin/org/openrs2/deob/transform/BundlerTransformer.kt
index e2bbcfba..9a5aa405 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/BundlerTransformer.kt
+++ b/deob/src/main/kotlin/org/openrs2/deob/transform/BundlerTransformer.kt
@@ -9,7 +9,7 @@ import javax.inject.Singleton
 
 @Singleton
 public class BundlerTransformer @Inject constructor(
-    @BundlerQualifier private val transformers: Set<@JvmSuppressWildcards Transformer>
+    @BundlerQualifier private val transformers: Set<Transformer>
 ) : Transformer() {
     override fun transform(classPath: ClassPath) {
         for (transformer in transformers) {
diff --git a/json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt b/json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt
index 3505059f..23ad9bbf 100644
--- a/json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt
+++ b/json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt
@@ -8,7 +8,7 @@ import javax.inject.Inject
 import javax.inject.Provider
 
 public class ObjectMapperProvider @Inject constructor(
-    private val modules: Set<@JvmSuppressWildcards Module>
+    private val modules: Set<Module>
 ) : Provider<ObjectMapper> {
     override fun get(): ObjectMapper {
         return ObjectMapper()
diff --git a/yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt b/yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt
index dcb5f04c..f25fbd7d 100644
--- a/yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt
+++ b/yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt
@@ -9,7 +9,7 @@ import javax.inject.Inject
 import javax.inject.Provider
 
 public class ObjectMapperProvider @Inject constructor(
-    private val modules: Set<@JvmSuppressWildcards Module>
+    private val modules: Set<Module>
 ) : Provider<ObjectMapper> {
     override fun get(): ObjectMapper {
         return ObjectMapper(YAMLFactory())