Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import play.api.{ Configuration, Environment }
*/
class ConfigModule extends Module {

override def bindings(environment: Environment, configuration: Configuration): Seq[Binding[_]] = Seq(
override def bindings(environment: Environment, configuration: Configuration): Seq[Binding[?]] = Seq(
bind[Config].toInstance(configuration.underlying)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class MailerPluginGuiceSpec extends Specification {
val mockedConfigurationProvider = mock(classOf[SMTPConfigurationProvider])
when(mockedConfigurationProvider.get()).thenReturn(SMTPConfiguration("example.org", 25, mock = true))

def createApp(additionalConfiguration: Map[String, _]): Application = {
def createApp(additionalConfiguration: Map[String, ?]): Application = {
new GuiceApplicationBuilder()
.configure(additionalConfiguration)
.overrides(new ConfigModule) // Play 2.5.x "hack"
Expand Down
Loading