Skip to content

Commit 2e52144

Browse files
committed
More wrangling dependencies
1 parent 7050dd0 commit 2e52144

File tree

4 files changed

+33
-8
lines changed

4 files changed

+33
-8
lines changed

buildSrc/src/main/groovy/convention.shared.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
id 'java-library'
33
id 'groovy'
44
id 'maven-publish'
5-
id 'idea'
65
}
76

87
version = rootProject.version
@@ -53,6 +52,10 @@ configurations {
5352
testAnnotationProcessor.extendsFrom allAnnotationProcessor
5453
extensionAnnotationProcessor.extendsFrom allAnnotationProcessor
5554
transformAnnotationProcessor.extendsFrom allAnnotationProcessor
55+
56+
sharedCompileOnly
57+
allCompileOnly.extendsFrom sharedCompileOnly
58+
compileOnlyApi.extendsFrom sharedCompileOnly
5659
}
5760

5861
dependencies {

common/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'convention.shared'
3-
alias libs.plugins.mdg
43
alias libs.plugins.architectury.loom
4+
alias libs.plugins.mdg
55
}
66

77
modsDotGroovy.multiplatform.expose()
@@ -44,9 +44,14 @@ dependencies {
4444
minecraft libs.minecraft
4545
modImplementation libs.fabric.loader
4646

47-
compileOnlyApi libs.groovybundler
48-
compileOnlyApi libs.jankson
49-
compileOnlyApi libs.nightconfig.toml
47+
sharedCompileOnly libs.groovybundler
48+
sharedCompileOnly libs.jankson
49+
sharedCompileOnly libs.nightconfig.toml
50+
}
51+
52+
afterEvaluate {
53+
configurations.transformCompileClasspath.extendsFrom configurations.minecraftNamedCompile
54+
configurations.extensionCompileClasspath.extendsFrom configurations.minecraftNamedCompile
5055
}
5156

5257
artifacts {

fabric/build.gradle

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,24 @@ dependencies {
3838
modImplementation libs.fabric.loader
3939
modImplementation libs.fabric.api
4040

41-
implementation libs.jankson
42-
implementation libs.nightconfig.toml
43-
41+
api libs.jankson
42+
api libs.nightconfig.toml
4443
implementation libs.groovyduvet
4544

45+
allCompileOnly libs.jankson
46+
allCompileOnly libs.nightconfig.toml
47+
allCompileOnly libs.groovyduvet
48+
4649
include libs.jankson
4750
include libs.nightconfig.toml
4851
include libs.nightconfig.core
4952
}
5053

54+
afterEvaluate {
55+
configurations.transformCompileClasspath.extendsFrom configurations.minecraftNamedCompile
56+
configurations.extensionCompileClasspath.extendsFrom configurations.minecraftNamedCompile
57+
}
58+
5159
loom {
5260
mixin {
5361
useLegacyMixinAp = true

neoforge/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@ dependencies {
4545
}
4646

4747
implementation libs.gml
48+
api libs.jankson
49+
50+
allCompileOnly libs.jankson
51+
allCompileOnly libs.gml
52+
}
53+
54+
afterEvaluate {
55+
configurations.transformCompileClasspath.extendsFrom configurations.minecraftNamedCompile
56+
configurations.extensionCompileClasspath.extendsFrom configurations.minecraftNamedCompile
4857
}
4958

5059
loom {

0 commit comments

Comments
 (0)