From 224e4794e2d30d60506398261b3ecb0a5a0642e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gro=C3=9Fmann?= <github@martymaximus.de>
Date: Mon, 27 Jan 2025 14:41:57 +0100
Subject: [PATCH 1/4] Update com.google.inject:guice lib to 5.1.0

---
 build.gradle      | 2 +-
 core/build.gradle | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2a60ddeca..fd66fbef9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ allprojects {
 subprojects {
     group 'io.testerra'
     version moduleVersion
-    archivesBaseName = "testerra"
+    base.archivesName = "testerra"
 
     apply plugin: 'maven-publish' // tasks publish and publishToMavenLocal
     apply plugin: 'jacoco-report-aggregation'
diff --git a/core/build.gradle b/core/build.gradle
index 92bc6efca..9cb31f5a0 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -6,7 +6,8 @@ dependencies {
 
     // <Testerra>
     // @see https://github.com/google/guice/issues/1256
-    api 'com.google.inject:guice:4.2.2:no_aop'
+//    api 'com.google.inject:guice:4.2.2:no_aop'
+    api 'com.google.inject:guice:5.1.0'
     api 'com.google.inject.extensions:guice-assistedinject:4.2.2'
     implementation 'org.reflections:reflections:0.9.12'
     // </Testerra>

From af471b56d36452bb1ef1f178f7e8ec8672c2bbdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gro=C3=9Fmann?= <github@martymaximus.de>
Date: Mon, 27 Jan 2025 15:02:14 +0100
Subject: [PATCH 2/4] Updated Google Guice assistedinject lib

---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 9cb31f5a0..13eef9cdc 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     // @see https://github.com/google/guice/issues/1256
 //    api 'com.google.inject:guice:4.2.2:no_aop'
     api 'com.google.inject:guice:5.1.0'
-    api 'com.google.inject.extensions:guice-assistedinject:4.2.2'
+    api 'com.google.inject.extensions:guice-assistedinject:5.1.0'
     implementation 'org.reflections:reflections:0.9.12'
     // </Testerra>
 

From f88ebae20cc747e7d2d34f41f9d8c87675bab2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gro=C3=9Fmann?= <github@martymaximus.de>
Date: Mon, 27 Jan 2025 16:31:11 +0100
Subject: [PATCH 3/4] Updated google guice to 6.0.0

---
 core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 13eef9cdc..dee3a7916 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -7,8 +7,8 @@ dependencies {
     // <Testerra>
     // @see https://github.com/google/guice/issues/1256
 //    api 'com.google.inject:guice:4.2.2:no_aop'
-    api 'com.google.inject:guice:5.1.0'
-    api 'com.google.inject.extensions:guice-assistedinject:5.1.0'
+    api 'com.google.inject:guice:6.0.0'
+    api 'com.google.inject.extensions:guice-assistedinject:6.0.0'
     implementation 'org.reflections:reflections:0.9.12'
     // </Testerra>
 

From 23bb892ca02919d2c4caa2f34007d98b024e762d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gro=C3=9Fmann?= <github@martymaximus.de>
Date: Mon, 27 Jan 2025 16:55:03 +0100
Subject: [PATCH 4/4] Cleanup

---
 core/build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index dee3a7916..bad2e0c46 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -5,8 +5,6 @@ dependencies {
     api project(':logging')
 
     // <Testerra>
-    // @see https://github.com/google/guice/issues/1256
-//    api 'com.google.inject:guice:4.2.2:no_aop'
     api 'com.google.inject:guice:6.0.0'
     api 'com.google.inject.extensions:guice-assistedinject:6.0.0'
     implementation 'org.reflections:reflections:0.9.12'