mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-06-18 14:50:56 +00:00
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:
@@ -5,7 +5,9 @@ import java.net.URI
|
|||||||
import java.net.URL
|
import java.net.URL
|
||||||
import java.nio.file.FileSystems
|
import java.nio.file.FileSystems
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.ProviderNotFoundException
|
||||||
import java.nio.file.StandardCopyOption
|
import java.nio.file.StandardCopyOption
|
||||||
|
import java.nio.file.spi.FileSystemProvider
|
||||||
import org.gradle.api.DefaultTask
|
import org.gradle.api.DefaultTask
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
import org.gradle.api.plugins.BasePluginExtension
|
import org.gradle.api.plugins.BasePluginExtension
|
||||||
@@ -46,7 +48,14 @@ fun Project.configureDistribution() {
|
|||||||
// https://github.com/johnrengelman/shadow/issues/111
|
// https://github.com/johnrengelman/shadow/issues/111
|
||||||
val dest = URI.create("jar:" + tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toURI())
|
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") {
|
forSubProjects(":common:addons") {
|
||||||
val jar = getJarTask()
|
val jar = getJarTask()
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import java.util.*
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("dev.architectury.loom") version Versions.Mod.architecuryLoom
|
id("dev.architectury.loom") version Versions.Mod.architecuryLoom
|
||||||
id("architectury-plugin") version Versions.Mod.architecturyPlugin
|
id("architectury-plugin") version Versions.Mod.architecturyPlugin
|
||||||
@@ -61,6 +63,6 @@ tasks {
|
|||||||
remapJar {
|
remapJar {
|
||||||
injectAccessWidener.set(true)
|
injectAccessWidener.set(true)
|
||||||
inputFile.set(shadowJar.get().archiveFile)
|
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")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import java.util.*
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("dev.architectury.loom") version Versions.Mod.architecuryLoom
|
id("dev.architectury.loom") version Versions.Mod.architecuryLoom
|
||||||
id("architectury-plugin") version Versions.Mod.architecturyPlugin
|
id("architectury-plugin") version Versions.Mod.architecturyPlugin
|
||||||
@@ -73,6 +75,6 @@ tasks {
|
|||||||
|
|
||||||
remapJar {
|
remapJar {
|
||||||
inputFile.set(shadowJar.get().archiveFile)
|
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")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -60,6 +60,6 @@ tasks {
|
|||||||
remapJar {
|
remapJar {
|
||||||
injectAccessWidener.set(true)
|
injectAccessWidener.set(true)
|
||||||
inputFile.set(shadowJar.get().archiveFile)
|
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")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user