From 7ba3dd23f3f4469acefebf8743c5a19990ab35b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 16:55:19 +0300 Subject: [PATCH] Bump daggerVersion from 2.47 to 2.48 in /Plan (#3187) * Bump daggerVersion from 2.47 to 2.48 in /Plan Bumps `daggerVersion` from 2.47 to 2.48. Updates `com.google.dagger:dagger` from 2.47 to 2.48 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.47...dagger-2.48) Updates `com.google.dagger:dagger-compiler` from 2.47 to 2.48 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.47...dagger-2.48) --- updated-dependencies: - dependency-name: com.google.dagger:dagger dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:dagger-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix duplicate binding issue --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> --- Plan/build.gradle | 2 +- .../plan/modules/bungee/BungeeSuperClassBindingModule.java | 2 +- .../com/djrapitops/plan/gathering/timed/ProxyTPSCounter.java | 4 ++-- .../djrapitops/plan/modules/ProxySuperClassBindingModule.java | 4 ---- .../modules/velocity/VelocitySuperClassBindingModule.java | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Plan/build.gradle b/Plan/build.gradle index 5e7336ddf..eb2b66a8b 100644 --- a/Plan/build.gradle +++ b/Plan/build.gradle @@ -67,7 +67,7 @@ subprojects { } ext { - daggerVersion = "2.47" + daggerVersion = "2.48" palVersion = "5.1.0" diff --git a/Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeSuperClassBindingModule.java b/Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeSuperClassBindingModule.java index 8b2600bf7..ee0bd607d 100644 --- a/Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeSuperClassBindingModule.java +++ b/Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeSuperClassBindingModule.java @@ -40,5 +40,5 @@ public interface BungeeSuperClassBindingModule { ListenerSystem bindListenerSystem(BungeeListenerSystem listenerSystem); @Binds - ServerSensor<Object> bindServerSensor(BungeeSensor sensor); + ServerSensor<?> bindServerSensor(BungeeSensor sensor); } \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/gathering/timed/ProxyTPSCounter.java b/Plan/common/src/main/java/com/djrapitops/plan/gathering/timed/ProxyTPSCounter.java index e5d662b29..a74fb66fa 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/gathering/timed/ProxyTPSCounter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/gathering/timed/ProxyTPSCounter.java @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; @Singleton public class ProxyTPSCounter extends TPSCounter { - private final ServerSensor<Object> serverSensor; + private final ServerSensor<?> serverSensor; private final SystemUsageBuffer systemUsage; private final DBSystem dbSystem; private final ServerInfo serverInfo; @@ -49,7 +49,7 @@ public class ProxyTPSCounter extends TPSCounter { @Inject public ProxyTPSCounter( - ServerSensor<Object> serverSensor, + ServerSensor<?> serverSensor, SystemUsageBuffer systemUsage, DBSystem dbSystem, ServerInfo serverInfo, diff --git a/Plan/common/src/main/java/com/djrapitops/plan/modules/ProxySuperClassBindingModule.java b/Plan/common/src/main/java/com/djrapitops/plan/modules/ProxySuperClassBindingModule.java index 4ea1e6c11..e443fbe75 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/modules/ProxySuperClassBindingModule.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/modules/ProxySuperClassBindingModule.java @@ -16,7 +16,6 @@ */ package com.djrapitops.plan.modules; -import com.djrapitops.plan.gathering.ServerSensor; import com.djrapitops.plan.settings.ConfigSystem; import com.djrapitops.plan.settings.ProxyConfigSystem; import com.djrapitops.plan.storage.database.DBSystem; @@ -38,7 +37,4 @@ public interface ProxySuperClassBindingModule { @Binds ConfigSystem bindConfigSystem(ProxyConfigSystem configSystem); - @Binds - ServerSensor<?> bindServerSensor(ServerSensor<Object> sensor); - } \ No newline at end of file diff --git a/Plan/velocity/src/main/java/com/djrapitops/plan/modules/velocity/VelocitySuperClassBindingModule.java b/Plan/velocity/src/main/java/com/djrapitops/plan/modules/velocity/VelocitySuperClassBindingModule.java index 9b8d10842..468a5de07 100644 --- a/Plan/velocity/src/main/java/com/djrapitops/plan/modules/velocity/VelocitySuperClassBindingModule.java +++ b/Plan/velocity/src/main/java/com/djrapitops/plan/modules/velocity/VelocitySuperClassBindingModule.java @@ -40,5 +40,5 @@ public interface VelocitySuperClassBindingModule { ListenerSystem bindListenerSystem(VelocityListenerSystem listenerSystem); @Binds - ServerSensor<Object> bindServerSensor(VelocitySensor sensor); + ServerSensor<?> bindServerSensor(VelocitySensor sensor); } \ No newline at end of file