Skip to content

Commit b0cedca

Browse files
committed
[change] fix bundled libs
1 parent 287f7b8 commit b0cedca

2 files changed

Lines changed: 12 additions & 24 deletions

File tree

build.gradle.kts

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,16 @@ allprojects {
174174
// PACKAGING MAIN JAR //
175175
////////////////////////
176176

177+
dependencies {
178+
subprojects.forEach {
179+
if (it.name == "jackfredlib-testmod") return@forEach
180+
181+
add("api", project(path = it.path))
182+
add("clientImplementation", project(path = it.path))
183+
add("include", project(path = it.path))
184+
}
185+
}
186+
177187
subprojects {
178188
if (name == "jackfredlib-testmod") return@subprojects
179189

@@ -188,28 +198,6 @@ subprojects {
188198
}
189199
}
190200

191-
// bundle modules
192-
tasks.named<Jar>("jar") {
193-
subprojects.forEach {
194-
if (it.name == "jackfredlib-testmod") return@forEach
195-
if (it.name == "jackfredlib-config") return@forEach
196-
197-
dependsOn(it.tasks.named("jar"))
198-
}
199-
200-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
201-
202-
doFirst {
203-
subprojects.forEach { subproj ->
204-
if (subproj.name == "jackfredlib-testmod") return@forEach
205-
if (subproj.name == "jackfredlib-config") return@forEach
206-
207-
val jarTask = subproj.tasks.named<Jar>("jar").get()
208-
from(zipTree(jarTask.archiveFile.get().asFile))
209-
}
210-
}
211-
}
212-
213201
/////////////
214202
// JAVADOC //
215203
/////////////
@@ -449,4 +437,4 @@ if (canPublish) {
449437
tasks.register<UpdateDependenciesTask>("updateModDependencies") {
450438
mcVersion.set(properties["minecraft_version"]!!.toString())
451439
loader.set("fabric")
452-
}
440+
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ github_repo=JackFredLib
3535
mod_name=JackFredLib
3636

3737
# Root Module
38-
module_version=0.10.6
38+
module_version=0.10.6.1
3939
module_name=JackFredLib
4040
module_description=Common code and hooks for JackFred's mods.

0 commit comments

Comments
 (0)