Add assisted injection extension

asm/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 dependencies {
     api(projects.util)
     api(libs.bundles.asm)
-    api(libs.guice)
+    api(libs.bundles.guice)
     api(libs.jackson.databind)
     api(libs.netty.buffer)
 

buffer/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.guice)
+    api(libs.bundles.guice)
     api(libs.netty.buffer)
 
     implementation(projects.util)

cache-550/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(projects.cache)
-    api(libs.guice)
+    api(libs.bundles.guice)
 
     implementation(projects.buffer)
     implementation(projects.util)

cache/build.gradle.kts

@@ -5,9 +5,9 @@ plugins {
 
 dependencies {
     api(projects.crypto)
+    api(libs.bundles.guice)
     api(libs.commons.compress)
     api(libs.fastutil)
-    api(libs.guice)
     api(libs.netty.buffer)
 
     implementation(projects.buffer)

conf/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(projects.crypto)
-    api(libs.guice)
+    api(libs.bundles.guice)
 
     implementation(projects.yaml)
 }

crypto/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(libs.bundles.bouncyCastle)
-    api(libs.guice)
+    api(libs.bundles.guice)
     api(libs.jackson.databind)
     api(libs.netty.buffer)
 

decompiler/build.gradle.kts

@@ -11,8 +11,8 @@ application {
 
 dependencies {
     api(projects.deobUtil)
+    api(libs.bundles.guice)
     api(libs.clikt)
-    api(libs.guice)
 
     implementation(projects.log)
     implementation(projects.util)

deob-ast/build.gradle.kts

@@ -10,8 +10,8 @@ application {
 
 dependencies {
     api(projects.deobUtil)
+    api(libs.bundles.guice)
     api(libs.clikt)
-    api(libs.guice)
 
     implementation(projects.inject)
     implementation(projects.log)

deob-bytecode/build.gradle.kts

@@ -9,8 +9,8 @@ application {
 }
 
 dependencies {
+    api(libs.bundles.guice)
     api(libs.clikt)
-    api(libs.guice)
 
     implementation(projects.deobAnnotations)
     implementation(projects.deobUtil)

gradle/libs.versions.toml

@@ -35,7 +35,8 @@ fastutil = { module = "it.unimi.dsi:fastutil", version = "8.5.8" }
 fernflower = { module = "org.openrs2:fernflower", version = "1.1.1" }
 flyway = { module = "org.flywaydb:flyway-core", version = "9.0.1" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
-guice = { module = "com.google.inject:guice", version.ref = "guice" }
+guice-core = { module = "com.google.inject:guice", version.ref = "guice" }
+guice-assistedInject = { module = "com.google.inject.extensions:guice-assistedinject", version.ref = "guice" }
 h2 = { module = "com.h2database:h2", version = "2.1.214" }
 hikaricp = { module = "com.zaxxer:HikariCP", version = "5.0.1" }
 inlineLogger = { module = "com.michael-bull.kotlin-inline-logger:kotlin-inline-logger", version = "1.0.4" }
@@ -84,6 +85,7 @@ xz = { module = "org.tukaani:xz", version = "1.9" }
 [bundles]
 asm = ["asm-core", "asm-commons", "asm-tree", "asm-util"]
 bouncyCastle = ["bouncyCastle-pkix", "bouncyCastle-provider"]
+guice = ["guice-core", "guice-assistedInject"]
 ktor = [
 	"ktor-serialization-jackson",
 	"ktor-server-auto-head-response",

http/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.guice)
+    api(libs.bundles.guice)
 
     implementation(libs.guava)
     implementation(libs.kotlin.coroutines.core)

inject/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.guice)
+    api(libs.bundles.guice)
 }
 
 publishing {

json/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.guice)
+    api(libs.bundles.guice)
     api(libs.jackson.databind)
 
     implementation(libs.jackson.kotlin)

net/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.guice)
+    api(libs.bundles.guice)
     api(libs.kotlin.coroutines.core)
     api(libs.netty.transport)
 

patcher/build.gradle.kts

@@ -10,8 +10,8 @@ application {
 
 dependencies {
     api(projects.asm)
+    api(libs.bundles.guice)
     api(libs.clikt)
-    api(libs.guice)
 
     implementation(projects.conf)
     implementation(projects.inject)

protocol/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
     api(projects.crypto)
+    api(libs.bundles.guice)
     api(libs.netty.codec.core)
 
     implementation(projects.buffer)

yaml/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api(libs.guice)
+    api(libs.bundles.guice)
     api(libs.jackson.databind)
 
     implementation(libs.jackson.kotlin)