1.5.4: Better encoding errors for i18n

changes/1.5.4.md

@@ -0,0 +1,7 @@
+# Gradle Plugins 1.5.3
+
+This version includes a small change for the KordEx plugin.
+
+## KordEx Plugin
+
+- For the `i18n` builder, attempt to throw a more useful error when the source translation bundle isn't using the UTF-8 encoding.

gradle.properties

@@ -3,4 +3,4 @@ kotlin.incremental=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m
 org.gradle.parallel=true
 
-projectVersion=1.5.3
+projectVersion=1.5.4

kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/helpers/I18nHelper.kt

@@ -11,6 +11,7 @@ import dev.kordex.i18n.generator.TranslationsClass
 import org.gradle.api.Project
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.kotlin.dsl.*
+import java.nio.charset.MalformedInputException
 import java.nio.file.Files
 import java.util.Properties
 
@@ -45,24 +46,31 @@ object I18nHelper {
 			inputs.file(inputFile)
 
 			doLast {
-				val props = Properties()
-
-				props.load(
-					Files.newBufferedReader(
-						inputFile.toPath(),
-						Charsets.UTF_8
+				try {
+					val props = Properties()
+
+					props.load(
+						Files.newBufferedReader(
+							inputFile.toPath(),
+							Charsets.UTF_8
+						)
 					)
-				)
 
-				val translationsClass = TranslationsClass(
-					bundle = bundle.joinToString("."),
-					allProps = props,
-					className = extension.i18n.className.get(),
-					classPackage = extension.i18n.classPackage.get(),
-					publicVisibility = extension.i18n.publicVisibility.get()
-				)
+					val translationsClass = TranslationsClass(
+						bundle = bundle.joinToString("."),
+						allProps = props,
+						className = extension.i18n.className.get(),
+						classPackage = extension.i18n.classPackage.get(),
+						publicVisibility = extension.i18n.publicVisibility.get()
+					)
 
-				translationsClass.writeTo(outputDirectory)
+					translationsClass.writeTo(outputDirectory)
+				} catch (e: MalformedInputException) {
+					error(
+						"Malformed input exception: ${e.message} - " +
+							"Check that your translation bundle is UTF-8 encoded!",
+					)
+				}
 			}
 		}
 

testModule/settings.gradle.kts

@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		val pluginVersion = "1.5.3"
+		val pluginVersion = "1.5.4"
 
 		kotlin("jvm") version "2.0.21"