Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force resolution of unpacked jars

Browse Source 
[no changelog]
This commit is contained in:
Linnea Gräf
2024-10-30 18:48:26 +01:00
parent b11b12585d
commit 9aa5f7c883
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle.kts
View File

@@ -7,7 +7,6 @@
*/ */
import com.google.devtools.ksp.gradle.KspTaskJvm import com.google.devtools.ksp.gradle.KspTaskJvm
import com.google.gson.JsonArray
import moe.nea.licenseextractificator.LicenseDiscoveryTask import moe.nea.licenseextractificator.LicenseDiscoveryTask
import moe.nea.mcautotranslations.gradle.CollectTranslations import moe.nea.mcautotranslations.gradle.CollectTranslations
import net.fabricmc.loom.LoomGradleExtension import net.fabricmc.loom.LoomGradleExtension
@@ -101,7 +100,7 @@ kotlin {
} }
} }
fun String.capitalizeN() = replaceFirstChar { it.uppercaseChar() } fun String.capitalizeN() = replaceFirstChar { it.uppercaseChar() }
fun innerJarsOf(name: String, dependency: Dependency): FileCollection { fun innerJarsOf(name: String, dependency: Dependency): Provider<FileTree> {
val task = tasks.create("unpackInnerJarsFor${name.capitalizeN()}", InnerJarsUnpacker::class) { val task = tasks.create("unpackInnerJarsFor${name.capitalizeN()}", InnerJarsUnpacker::class) {
this.inputJars.setFrom(files(configurations.detachedConfiguration(dependency))) this.inputJars.setFrom(files(configurations.detachedConfiguration(dependency)))
this.outputDir.set(layout.buildDirectory.dir("unpackedJars/$name").also { this.outputDir.set(layout.buildDirectory.dir("unpackedJars/$name").also {
@@ -109,7 +108,11 @@ fun innerJarsOf(name: String, dependency: Dependency): FileCollection {
}) })
} }
println("Constructed innerJars task: ${project.files(task).toList()}") println("Constructed innerJars task: ${project.files(task).toList()}")
return project.files(task) return project.provider {
val files = project.files(task)
files.files // Force resolution
files.asFileTree
}
} }
val collectTranslations by tasks.registering(CollectTranslations::class) { val collectTranslations by tasks.registering(CollectTranslations::class) {
@@ -242,7 +245,8 @@ dependencies {
(sodiumSourceSet.modImplementationConfigurationName)(libs.sodium) (sodiumSourceSet.modImplementationConfigurationName)(libs.sodium)
(citResewnSourceSet.modImplementationConfigurationName)( (citResewnSourceSet.modImplementationConfigurationName)(
innerJarsOf("citresewn", dependencies.create(libs.citresewn.get())).asFileTree) innerJarsOf("citresewn", dependencies.create(libs.citresewn.get()))
)
(citResewnSourceSet.modImplementationConfigurationName)(libs.citresewn) (citResewnSourceSet.modImplementationConfigurationName)(libs.citresewn)
(yaclSourceSet.modImplementationConfigurationName)(libs.yacl) (yaclSourceSet.modImplementationConfigurationName)(libs.yacl)