Skip to content

Commit

Permalink
Fix inclusion of common subproject in neo dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Erdragh committed Jul 27, 2024
1 parent c464fb0 commit e5eb592
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
11 changes: 7 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,12 @@ subprojects {
val runtimeLib by configurations.creating {
isTransitive = true
}
configurations.implementation.extendsFrom(configurations.named("shadowBotDep"))
configurations.implementation.extendsFrom(configurations.named("includeBotDep"))
configurations.implementation.extendsFrom(configurations.named("runtimeLib"))
// Configuration for depending on the common project
val commonDep by configurations.creating
configurations.implementation.extendsFrom(configurations.named(shadowBotDep.name))
configurations.implementation.extendsFrom(configurations.named(includeBotDep.name))
configurations.implementation.extendsFrom(configurations.named(runtimeLib.name))
configurations.implementation.extendsFrom(configurations.named(commonDep.name))

dependencies {
runtimeLib("org.xerial:sqlite-jdbc:$sqliteJDBCVersion")
Expand Down Expand Up @@ -216,7 +219,7 @@ subprojects {

dependencies {
// This is runtimeLib, because NG doesn't add the common classes to the runtime classpath correctly
runtimeLib(project(":common")) {
commonDep(project(":common")) {
isTransitive = false
}
}
Expand Down
1 change: 1 addition & 0 deletions neoforge/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ neoForge {
mods {
create(modId) {
sourceSet(project.sourceSets.main.get())
sourceSet(project(":common").sourceSets.main.get())
}
}

Expand Down

0 comments on commit e5eb592

Please sign in to comment.