mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-06-25 14:43:02 +00:00
Code Issues Releases Wiki Activity

Fix some dependencies not appearing in the POM

Browse Source 
Again! This time it was just the night-config ones.
This commit is contained in:
Jonathan Coates 2024-01-03 21:05:03 +00:00
parent 8be6b1b772
commit f115d43d07
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/cc/tweaked/gradle/CCTweakedExtension.kt
View File

@ -255,7 +255,7 @@ abstract class CCTweakedExtension(
} }
/** /**
* Exclude a dependency from being publisehd in Maven. * Exclude a dependency from being published in Maven.
*/ */
fun exclude(dep: Dependency) { fun exclude(dep: Dependency) {
excludedDeps.add(dep) excludedDeps.add(dep)

1
gradle/libs.versions.toml
View File

@ -180,7 +180,6 @@ kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
externalMods-common = ["jei-api", "nightConfig-core", "nightConfig-toml"] externalMods-common = ["jei-api", "nightConfig-core", "nightConfig-toml"]
externalMods-forge-compile = ["moreRed", "oculus", "jei-api"] externalMods-forge-compile = ["moreRed", "oculus", "jei-api"]
externalMods-forge-runtime = ["jei-forge"] externalMods-forge-runtime = ["jei-forge"]
externalMods-fabric = ["nightConfig-core", "nightConfig-toml"]
externalMods-fabric-compile = ["fabricPermissions", "iris", "jei-api", "rei-api", "rei-builtin"] externalMods-fabric-compile = ["fabricPermissions", "iris", "jei-api", "rei-api", "rei-builtin"]
externalMods-fabric-runtime = ["jei-fabric", "modmenu"] externalMods-fabric-runtime = ["jei-fabric", "modmenu"]

39
projects/fabric/build.gradle.kts
View File

@ -46,9 +46,25 @@ fun addRemappedConfiguration(name: String) {
addRemappedConfiguration("testWithSodium") addRemappedConfiguration("testWithSodium")
addRemappedConfiguration("testWithIris") addRemappedConfiguration("testWithIris")
configurations {
// Declare some configurations which are both included (jar-in-jar-ed) and a normal dependency (so they appear in
// our POM).
val includeRuntimeOnly by registering {
isCanBeConsumed = false
isCanBeResolved = false
}
val includeImplementation by registering {
isCanBeConsumed = false
isCanBeResolved = false
}
include { extendsFrom(includeRuntimeOnly.get(), includeImplementation.get()) }
runtimeOnly { extendsFrom(includeRuntimeOnly.get()) }
implementation { extendsFrom(includeImplementation.get()) }
}
dependencies { dependencies {
clientCompileOnly(variantOf(libs.emi) { classifier("api") }) clientCompileOnly(variantOf(libs.emi) { classifier("api") })
modImplementation(libs.bundles.externalMods.fabric) { cct.exclude(this) }
modCompileOnly(libs.bundles.externalMods.fabric.compile) { modCompileOnly(libs.bundles.externalMods.fabric.compile) {
exclude("net.fabricmc", "fabric-loader") exclude("net.fabricmc", "fabric-loader")
exclude("net.fabricmc.fabric-api") exclude("net.fabricmc.fabric-api")
@ -63,24 +79,19 @@ dependencies {
"modTestWithIris"(libs.iris) "modTestWithIris"(libs.iris)
"modTestWithIris"(libs.sodium) "modTestWithIris"(libs.sodium)
include(libs.cobalt) "includeRuntimeOnly"(libs.cobalt)
include(libs.jzlib) "includeRuntimeOnly"(libs.jzlib)
include(libs.netty.http) "includeRuntimeOnly"(libs.netty.http)
include(libs.netty.socks) "includeRuntimeOnly"(libs.netty.socks)
include(libs.netty.proxy) "includeRuntimeOnly"(libs.netty.proxy)
include(libs.nightConfig.core)
include(libs.nightConfig.toml) "includeImplementation"(libs.nightConfig.core)
"includeImplementation"(libs.nightConfig.toml)
// Pull in our other projects. See comments in MinecraftConfigurations on this nastiness. // Pull in our other projects. See comments in MinecraftConfigurations on this nastiness.
api(commonClasses(project(":fabric-api"))) { cct.exclude(this) } api(commonClasses(project(":fabric-api"))) { cct.exclude(this) }
clientApi(clientClasses(project(":fabric-api"))) { cct.exclude(this) } clientApi(clientClasses(project(":fabric-api"))) { cct.exclude(this) }
implementation(project(":core")) { cct.exclude(this) } implementation(project(":core")) { cct.exclude(this) }
// These are transitive deps of :core, so we don't need these deps. However, we want them to appear as runtime deps
// in our POM, and this is the easiest way.
runtimeOnly(libs.cobalt)
runtimeOnly(libs.netty.http)
runtimeOnly(libs.netty.socks)
runtimeOnly(libs.netty.proxy)
annotationProcessorEverywhere(libs.autoService) annotationProcessorEverywhere(libs.autoService)