Skip to content

Commit aa3068b

Browse files
Remove redundant gradle configurations
1 parent 93f7ef1 commit aa3068b

2 files changed

Lines changed: 9 additions & 29 deletions

File tree

buildSrc/src/main/kotlin/com/teamwizardry/gradle/module/ModuleExtension.kt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,13 @@ open class ModuleExtension(private val ctx: DslContext) {
4040
fun moduleDependencies(vararg modules: String) {
4141
ctx.project.dependencies {
4242
for (module in modules) {
43-
"liblib"(project(":${module}", configuration = "namedElements"))
43+
"api"(project(":${module}", configuration = "namedElements"))
4444
}
4545
}
4646
for (module in modules) {
4747
moduleInfo.dependencies.add(commonConfig.modules[module])
4848
}
4949
}
50-
51-
init {
52-
ctx.project.configurations.register("liblib") {
53-
description = "Inter-module dependencies"
54-
55-
isCanBeConsumed = false
56-
isCanBeResolved = false
57-
}
58-
}
5950
}
6051

6152
data class ShadowRule(val from: String, val to: String)

buildSrc/src/main/kotlin/module-conventions.gradle.kts

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,9 @@ configurations {
4343

4444
canBe(consumed = true, resolved = false)
4545
}
46-
create("publishedApi") {
47-
canBe(consumed = true, resolved = false)
48-
}
49-
create("publishedRuntime") {
50-
canBe(consumed = true, resolved = false)
51-
}
52-
create("publishedSources") {
46+
create("sourcesJar") {
47+
description = "The remapped and shadowed sources of the main mod"
48+
5349
canBe(consumed = true, resolved = false)
5450
}
5551

@@ -61,8 +57,6 @@ configurations {
6157
canBe(consumed = false, resolved = true)
6258
}
6359

64-
val liblib = named("liblib") // liblib is already created by the module plugin
65-
6660
val includeApi = create("includeApi") {
6761
description = "Jar-in-jar 'api' dependencies"
6862

@@ -76,7 +70,7 @@ configurations {
7670
}
7771

7872
named("api") {
79-
extendsFrom(liblib.get(), includeApi, shade)
73+
extendsFrom(includeApi, shade)
8074
}
8175
named("include") {
8276
extendsFrom(includeApi, includeImplementation)
@@ -245,6 +239,7 @@ artifacts {
245239
add("namedElements", shadowJar)
246240
add("modJar", remapJar)
247241
add("testModJar", remapTestJar)
242+
add("sourcesJar", sourcesJar)
248243
}
249244

250245
//endregion // Build configuration
@@ -253,19 +248,13 @@ artifacts {
253248
/* region == Publishing == */
254249

255250
if (project.name != "testcore") {
256-
artifacts {
257-
add("publishedApi", remapJar)
258-
add("publishedRuntime", remapJar)
259-
add("publishedSources", sourcesJar)
260-
}
261-
262-
module.component.addVariantsFromConfiguration(configurations["publishedApi"]) {
251+
module.component.addVariantsFromConfiguration(configurations["modJar"]) {
263252
mapToMavenScope("compile")
264253
}
265-
module.component.addVariantsFromConfiguration(configurations["publishedRuntime"]) {
254+
module.component.addVariantsFromConfiguration(configurations["modJar"]) {
266255
mapToMavenScope("runtime")
267256
}
268-
module.component.addVariantsFromConfiguration(configurations["publishedSources"]) {
257+
module.component.addVariantsFromConfiguration(configurations["sourcesJar"]) {
269258
}
270259

271260
publishing {

0 commit comments

Comments
 (0)