Fix stupid build error and a couple gradle warnings

thank you gradle .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } is clearly better than .capitalize()
This commit is contained in:
Zoë Gidiere
2023-11-05 20:07:13 -07:00
parent ad9bc7f67c
commit 77812545df
4 changed files with 17 additions and 4 deletions

View File

@@ -5,7 +5,9 @@ import java.net.URI
import java.net.URL
import java.nio.file.FileSystems
import java.nio.file.Files
import java.nio.file.ProviderNotFoundException
import java.nio.file.StandardCopyOption
import java.nio.file.spi.FileSystemProvider
import org.gradle.api.DefaultTask
import org.gradle.api.Project
import org.gradle.api.plugins.BasePluginExtension
@@ -46,7 +48,14 @@ fun Project.configureDistribution() {
// https://github.com/johnrengelman/shadow/issues/111
val dest = URI.create("jar:" + tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toURI())
FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
val preExistingProvider = try {
FileSystems.getFileSystem(dest)
} catch (e: Exception) {
null
};
val provider = if (preExistingProvider == null) { preExistingProvider } else { FileSystems.newFileSystem(dest, mapOf("create" to "false"), null)
};
provider?.use { fs ->
forSubProjects(":common:addons") {
val jar = getJarTask()

View File

@@ -1,3 +1,5 @@
import java.util.*
plugins {
id("dev.architectury.loom") version Versions.Mod.architecuryLoom
id("architectury-plugin") version Versions.Mod.architecturyPlugin
@@ -61,6 +63,6 @@ tasks {
remapJar {
injectAccessWidener.set(true)
inputFile.set(shadowJar.get().archiveFile)
archiveFileName.set("${rootProject.name.capitalize()}-fabric-${project.version}.jar")
archiveFileName.set("${rootProject.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}-fabric-${project.version}.jar")
}
}

View File

@@ -1,3 +1,5 @@
import java.util.*
plugins {
id("dev.architectury.loom") version Versions.Mod.architecuryLoom
id("architectury-plugin") version Versions.Mod.architecturyPlugin
@@ -73,6 +75,6 @@ tasks {
remapJar {
inputFile.set(shadowJar.get().archiveFile)
archiveFileName.set("${rootProject.name.capitalize()}-forge-${project.version}.jar")
archiveFileName.set("${rootProject.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}-forge-${project.version}.jar")
}
}

View File

@@ -60,6 +60,6 @@ tasks {
remapJar {
injectAccessWidener.set(true)
inputFile.set(shadowJar.get().archiveFile)
archiveFileName.set("${rootProject.name.capitalize()}-quilt-${project.version}.jar")
archiveFileName.set("${rootProject.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() })}-quilt-${project.version}.jar")
}
}