⬆️ Update Guice to 4.2.2

diff --git a/build.gradle b/build.gradle
index 7e5604f..1cee731 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib'
     compile group: 'net.pterodactylus', name: 'utils', version: '0.12.4'
 
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib'
     compile group: 'net.pterodactylus', name: 'utils', version: '0.12.4'

-    compile group: 'com.google.inject', name: 'guice', version: '3.0'
+    compile group: 'com.google.inject', name: 'guice', version: '4.2.2'

     compile group: 'com.google.guava', name: 'guava', version: '27.0.1-android'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.1'
     compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.1'
     compile group: 'com.google.guava', name: 'guava', version: '27.0.1-android'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.1'
     compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.1'

diff --git a/src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt
index a8da595..1253d0a 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt
@@ -6,6 +6,7 @@ import com.google.inject.Provides
 import freenet.client.HighLevelSimpleClient
 import freenet.node.Node
 import freenet.pluginmanager.PluginRespirator
 import freenet.client.HighLevelSimpleClient
 import freenet.node.Node
 import freenet.pluginmanager.PluginRespirator

+import javax.inject.Provider

 import javax.inject.Singleton
 
 /**
 import javax.inject.Singleton
 
 /**


@@ -14,9 +15,9 @@ import javax.inject.Singleton
 class FreenetModule(private val pluginRespirator: PluginRespirator): Module {
 
        override fun configure(binder: Binder): Unit = binder.run {
 class FreenetModule(private val pluginRespirator: PluginRespirator): Module {
 
        override fun configure(binder: Binder): Unit = binder.run {

-               bind(PluginRespirator::class.java).toProvider { pluginRespirator }
-               pluginRespirator.node!!.let { node -> bind(Node::class.java).toProvider { node } }
-               bind(HighLevelSimpleClient::class.java).toProvider { pluginRespirator.hlSimpleClient!! }
+               bind(PluginRespirator::class.java).toProvider(Provider<PluginRespirator> { pluginRespirator })
+               pluginRespirator.node!!.let { node -> bind(Node::class.java).toProvider(Provider<Node> { node }) }
+               bind(HighLevelSimpleClient::class.java).toProvider(Provider<HighLevelSimpleClient> { pluginRespirator.hlSimpleClient!! })

        }
 
        @Provides @Singleton
        }
 
        @Provides @Singleton

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
index f9119c3..360b0cd 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt
@@ -5,16 +5,16 @@ import com.google.inject.Module
 import javax.inject.Provider
 import kotlin.reflect.KClass
 
 import javax.inject.Provider
 import kotlin.reflect.KClass
 

-fun <T : Any> KClass<T>.isProvidedBy(instance: T) = Module { it.bind(this.java).toProvider { instance } }
+fun <T : Any> KClass<T>.isProvidedBy(instance: T) = Module { it.bind(this.java).toProvider(Provider<T> { instance }) }

 fun <T : Any> KClass<T>.isProvidedBy(provider: com.google.inject.Provider<T>) = Module { it.bind(this.java).toProvider(provider) }
 fun <T : Any> KClass<T>.isProvidedBy(provider: KClass<out Provider<T>>) = Module { it.bind(this.java).toProvider(provider.java) }
 fun <T : Any> KClass<T>.isProvidedBy(provider: com.google.inject.Provider<T>) = Module { it.bind(this.java).toProvider(provider) }
 fun <T : Any> KClass<T>.isProvidedBy(provider: KClass<out Provider<T>>) = Module { it.bind(this.java).toProvider(provider.java) }

-inline fun <reified T : Any> KClass<T>.isProvidedByMock() = Module { it.bind(this.java).toProvider { mock() } }
+inline fun <reified T : Any> KClass<T>.isProvidedByMock() = Module { it.bind(this.java).toProvider(Provider<T> { mock() }) }

 
 inline fun <reified T : Any> Injector.getInstance() = getInstance(T::class.java)!!
 
 fun <T : Any> supply(javaClass: Class<T>): Source<T> = object : Source<T> {
        override fun fromInstance(instance: T) = Module { it.bind(javaClass).toInstance(instance) }
 
 inline fun <reified T : Any> Injector.getInstance() = getInstance(T::class.java)!!
 
 fun <T : Any> supply(javaClass: Class<T>): Source<T> = object : Source<T> {
        override fun fromInstance(instance: T) = Module { it.bind(javaClass).toInstance(instance) }

-       override fun byInstance(instance: T) = Module { it.bind(javaClass).toProvider { instance } }
+       override fun byInstance(instance: T) = Module { it.bind(javaClass).toProvider(Provider<T> { instance }) }

        override fun byProvider(provider: com.google.inject.Provider<T>) = Module { it.bind(javaClass).toProvider(provider) }
        override fun byProvider(provider: Class<Provider<T>>) = Module { it.bind(javaClass).toProvider(provider) }
 }
        override fun byProvider(provider: com.google.inject.Provider<T>) = Module { it.bind(javaClass).toProvider(provider) }
        override fun byProvider(provider: Class<Provider<T>>) = Module { it.bind(javaClass).toProvider(provider) }
 }