diff --git a/CHANGELOG.md b/CHANGELOG.md index 724f683db0c..cbb0ce5fa10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.16.11 + +* `LanguageCodes`: + * In android and JVM targets now available `toJavaLocale` and from Java `Locale` conversations from/to + `IetfLanguageCode` + ## 0.16.10 * `Repos`: diff --git a/gradle.properties b/gradle.properties index 3dcf587fbdf..9bad69f4bfb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,5 +14,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.16.10 -android_code_version=178 +version=0.16.11 +android_code_version=179 diff --git a/language_codes/build.gradle b/language_codes/build.gradle index 7c54502f100..8515ddb2e83 100644 --- a/language_codes/build.gradle +++ b/language_codes/build.gradle @@ -5,3 +5,11 @@ plugins { } apply from: "$mppProjectWithSerializationPresetPath" + +kotlin { + sourceSets { + androidMain { + dependsOn jvmMain + } + } +} diff --git a/language_codes/src/jvmMain/kotlin/Locale.kt b/language_codes/src/jvmMain/kotlin/Locale.kt new file mode 100644 index 00000000000..5f361402f2c --- /dev/null +++ b/language_codes/src/jvmMain/kotlin/Locale.kt @@ -0,0 +1,8 @@ +package dev.inmo.micro_utils.language_codes + +import java.util.Locale + +fun IetfLanguageCode.toJavaLocale(): Locale = Locale.forLanguageTag(code) +fun IetfLanguageCode?.toJavaLocaleOrDefault(): Locale = this ?.toJavaLocale() ?: Locale.getDefault() + +fun Locale.toIetfLanguageCode(): IetfLanguageCode = IetfLanguageCode(toLanguageTag())