diff --git a/plugin/src/main/kotlin/xyz/jpenilla/runtask/pluginsapi/PluginDownloadServiceImpl.kt b/plugin/src/main/kotlin/xyz/jpenilla/runtask/pluginsapi/PluginDownloadServiceImpl.kt index 68baf71..1f1ecfc 100644 --- a/plugin/src/main/kotlin/xyz/jpenilla/runtask/pluginsapi/PluginDownloadServiceImpl.kt +++ b/plugin/src/main/kotlin/xyz/jpenilla/runtask/pluginsapi/PluginDownloadServiceImpl.kt @@ -383,7 +383,7 @@ private data class Hash( val hash: String, val type: String ) { - fun type() = HashingAlgorithm.valueOf(type.toUpperCase(Locale.ENGLISH)) + fun type() = HashingAlgorithm.valueOf(type.uppercase(Locale.ENGLISH)) fun check(file: Path): Boolean = toHexString(file.calculateHash(type())) == hash } diff --git a/plugin/src/main/kotlin/xyz/jpenilla/runtask/service/DownloadsAPIService.kt b/plugin/src/main/kotlin/xyz/jpenilla/runtask/service/DownloadsAPIService.kt index 2e2adb8..9f2d33c 100644 --- a/plugin/src/main/kotlin/xyz/jpenilla/runtask/service/DownloadsAPIService.kt +++ b/plugin/src/main/kotlin/xyz/jpenilla/runtask/service/DownloadsAPIService.kt @@ -23,6 +23,7 @@ import org.gradle.kotlin.dsl.registerIfAbsent import xyz.jpenilla.runtask.paperapi.DownloadsAPI import xyz.jpenilla.runtask.paperapi.Projects import xyz.jpenilla.runtask.util.Constants +import xyz.jpenilla.runtask.util.capitalized import xyz.jpenilla.runtask.util.set import xyz.jpenilla.runtask.util.sharedCaches import java.nio.file.Path @@ -80,7 +81,7 @@ public interface DownloadsAPIService { } private fun String.defaultDisplayName(): String = - split('-').joinToString(" ") { it.capitalize() } + split('-').joinToString(" ") { it.capitalized() } /** * Get the default [DownloadsAPIService] used to download Paper. diff --git a/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/durations.kt b/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/durations.kt index d6edc22..f67a0c1 100644 --- a/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/durations.kt +++ b/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/durations.kt @@ -84,4 +84,4 @@ internal fun Duration.prettyPrint(): String = toString() .substring(2) .replace("(\\d[HMS])(?!$)".toRegex(), "$1 ") - .toLowerCase(Locale.ENGLISH) + .lowercase(Locale.ENGLISH) diff --git a/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/extensions.kt b/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/extensions.kt index 2769aa0..45f49d8 100644 --- a/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/extensions.kt +++ b/plugin/src/main/kotlin/xyz/jpenilla/runtask/util/extensions.kt @@ -30,6 +30,7 @@ import org.gradle.jvm.toolchain.JavaToolchainService import org.gradle.kotlin.dsl.findByType import org.gradle.kotlin.dsl.named import org.gradle.kotlin.dsl.register +import java.util.Locale import kotlin.reflect.KClass internal fun Project.findJavaLauncher(): Provider? { @@ -59,3 +60,6 @@ internal fun PolymorphicDomainObjectContainer.configure( } internal fun ExtensiblePolymorphicDomainObjectContainer.registerFactory(type: KClass, config: (String) -> U): Unit = registerFactory(type.java, config) + +internal fun String.capitalized(locale: Locale = Locale.ROOT): String = + replaceFirstChar { if (it.isLowerCase()) it.titlecase(locale) else it.toString() }