Skip to content

Commit ba2c09a

Browse files
committed
Fix dependency configurations
1 parent d1e6a85 commit ba2c09a

File tree

3 files changed

+42
-35
lines changed

3 files changed

+42
-35
lines changed

Common/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ dependencies {
2121
modImplementation(libs.fabric.loader)
2222
modApi(libs.architectury)
2323

24-
modImplementation(libs.hexcasting.common)
25-
modImplementation(libs.paucal.common)
26-
modImplementation(libs.patchouli.xplat)
24+
modApi(libs.hexcasting.common)
2725

28-
modImplementation(libs.clothConfig.common)
26+
modApi(libs.clothConfig.common)
2927

3028
implementation(libs.mixinExtras)
3129

32-
implementation(libs.bundles.lsp4j)
30+
api(libs.bundles.lsp4j)
31+
3332
implementation(libs.ktor.network)
3433
}

Fabric/build.gradle.kts

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import hexdebug.libs
2-
31
plugins {
42
id("hexdebug.conventions.platform")
53
}
@@ -49,30 +47,35 @@ dependencies {
4947
exclude(group = "net.fabricmc", module = "fabric-loader")
5048
}
5149

52-
modImplementation(libs.hexcasting.fabric) {
50+
modApi(libs.hexcasting.fabric) {
5351
// If not excluded here, calls a nonexistent method and crashes the dev client
5452
exclude(module = "phosphor")
5553
}
56-
modImplementation(libs.paucal.fabric)
57-
modImplementation(libs.patchouli.fabric)
58-
modImplementation(libs.cardinalComponents)
59-
modImplementation(libs.serializationHooks)
60-
modImplementation(libs.trinkets)
61-
62-
implementation(libs.mixinExtras)
54+
modLocalRuntime(libs.paucal.fabric)
55+
modLocalRuntime(libs.patchouli.fabric)
56+
modLocalRuntime(libs.cardinalComponents)
57+
modLocalRuntime(libs.serializationHooks)
58+
modLocalRuntime(libs.trinkets)
59+
60+
libs.mixinExtras.also {
61+
localRuntime(it)
62+
include(it)
63+
}
6364

6465
modApi(libs.clothConfig.fabric) {
65-
exclude(group = "net.fabricmc.fabric-debugger")
66+
exclude(group = "net.fabricmc.fabric-api")
6667
}
67-
modApi(libs.modMenu)
68+
modImplementation(libs.modMenu)
6869

69-
implementation(libs.bundles.lsp4j)
70-
implementation(libs.ktor.network)
70+
libs.bundles.lsp4j.also {
71+
api(it)
72+
include(it)
73+
}
7174

72-
include(libs.serializationHooks)
73-
include(libs.mixinExtras)
74-
include(libs.bundles.lsp4j)
75-
include(libs.bundles.ktor)
75+
libs.ktor.network.also {
76+
implementation(it)
77+
include(it)
78+
}
7679
}
7780

7881
// this fails if we do it for all projects, since the tag already exists :/

Forge/build.gradle.kts

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,29 @@ dependencies {
5959

6060
implementation(libs.kotlin.forge)
6161

62-
modImplementation(libs.hexcasting.forge) { isTransitive = false }
62+
modApi(libs.hexcasting.forge) { isTransitive = false }
6363
modImplementation(libs.paucal.forge)
64-
modImplementation(libs.patchouli.forge)
65-
modImplementation(libs.caelus)
64+
modLocalRuntime(libs.patchouli.forge)
65+
modLocalRuntime(libs.caelus)
6666

6767
modApi(libs.clothConfig.forge)
6868

69-
implementation(libs.mixinExtras)
70-
implementation(libs.bundles.lsp4j)
71-
implementation(libs.bundles.ktor)
69+
libs.mixinExtras.also {
70+
localRuntime(it)
71+
include(it)
72+
}
7273

73-
include(libs.mixinExtras)
74-
include(libs.bundles.lsp4j)
75-
include(libs.bundles.ktor)
74+
libs.bundles.lsp4j.also {
75+
api(it)
76+
include(it)
77+
forgeRuntimeLibrary(it)
78+
}
7679

77-
// GOD I HATE FORGE
78-
forgeRuntimeLibrary(libs.bundles.lsp4j)
79-
kotlinForgeRuntimeLibrary(libs.bundles.ktor)
80+
libs.bundles.ktor.also {
81+
implementation(it)
82+
include(it)
83+
kotlinForgeRuntimeLibrary(it)
84+
}
8085
}
8186

8287
tasks {

0 commit comments

Comments
 (0)