1.5.7: Option to switch to ICU Message Format v2.

Author: gdude2002

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,11 @@
+# Gradle Plugins 1.5.7
+
+This version includes a change to the KordEx plugin, specifically the translation class generator.
+
+## KordEx Plugin
+
+- Update the translation class generator.
+  - The translation class generator now alphabetically sorts the generated keys and objects, for easier browsing.
+- Add a new `messageFormatVersion` property to the `i18n` builder.
+  - If you want to use [ICU Message Format version 2](https://unicode-org.github.io/icu/userguide/format_parse/messages/mf2.html) (still in development preview), set this to `2`. This will require the latest build of KordEx version `2.3.1-SNAPSHOT` or later.
+  - This option defaults to `1`, and this setting won't break the generated code — thus keeping compatibility with `2.3.0-SNAPSHOT` and later.

.idea/kotlinc.xml

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

changes/1.5.7.md

@@ -49,7 +49,9 @@ dependencies {
 	implementation("com.jcabi:jcabi-manifests:2.1.0")
 	implementation("com.squareup:kotlinpoet:1.18.1")
 	implementation("com.github.zafarkhaja:java-semver:0.10.2")
-	implementation("dev.kordex.i18n:i18n-generator:1.0.5")
+
+	implementation("dev.kordex.i18n:i18n-generator:1.0.6")
+
 	implementation("io.github.pdvrieze.xmlutil:core-jvm:0.86.3")
 	implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3")
 

gradle.properties

@@ -8,6 +8,7 @@ package dev.kordex.gradle.plugins.kordex.helpers
 
 import dev.kordex.gradle.plugins.kordex.InternalAPI
 import dev.kordex.gradle.plugins.kordex.i18n.KordExI18nSettings
+import dev.kordex.i18n.generator.MESSAGE_FORMAT_VERSIONS
 import dev.kordex.i18n.generator.TranslationsClass
 import org.gradle.api.Project
 import org.gradle.api.tasks.SourceSetContainer
@@ -66,6 +67,7 @@ object I18nHelper {
 						classPackage = extension.classPackage.get(),
 						publicVisibility = extension.publicVisibility.get(),
 						splitToCamelCase = extension.camelCaseNames.get(),
+						messageFormatVersion = extension.messageFormatVersion.get(),
 					)
 
 					translationsClass.writeTo(outputDirectory)
@@ -107,5 +109,12 @@ object I18nHelper {
 				error("Required property $key has not been set.")
 			}
 		}
+
+		if (extension.messageFormatVersion.get() !in MESSAGE_FORMAT_VERSIONS) {
+			error(
+				"Invalid message format version ${extension.messageFormatVersion} - " +
+					"must be one of ${MESSAGE_FORMAT_VERSIONS.joinToString()}"
+			)
+		}
 	}
 }

kordex/build.gradle.kts

@@ -23,6 +23,7 @@ class KordExI18nSettings(props: PropertyFactory) {
 	val configureSourceSet: Property<Boolean> = props.boolean(true)
 	val outputDirectory: Property<File> = props.single()
 
+	val messageFormatVersion: Property<Int> = props.single<Int>().convention(1)
 	val publicVisibility: Property<Boolean> = props.boolean(true)
 
 	@Deprecated(

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

@@ -21,7 +21,7 @@ kordEx {
 	module("extra-pluralkit")
 	module("func-mappings")
 
-	kordExVersion = "2.3.0-SNAPSHOT"
+	kordExVersion = "2.3.1-SNAPSHOT"
 	kordVersion = "latest"
 
 	bot {
@@ -32,7 +32,7 @@ kordEx {
 		classPackage = "template.i18n"
 		translationBundle = "template.strings"
 		publicVisibility = false
-		camelCaseNames = false
+		messageFormatVersion = 2
 	}
 }
 

kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/i18n/KordExI18nSettings.kt

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