From 18d63eb98050632c6f5e5bc4ea06380604b2db8b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 19 Feb 2023 19:20:03 +0600 Subject: [PATCH 1/3] start 0.16.11 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 724f683db0c..85681f4e8d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.16.11 + ## 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 From 85455ab21c7ceb55d43bc1d59bb054480133ae7b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 19 Feb 2023 19:34:42 +0600 Subject: [PATCH 2/3] improvements in language codes --- CHANGELOG.md | 4 ++++ language_codes/build.gradle | 8 ++++++++ language_codes/src/jvmMain/kotlin/Locale.kt | 8 ++++++++ 3 files changed, 20 insertions(+) create mode 100644 language_codes/src/jvmMain/kotlin/Locale.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 85681f4e8d9..cbb0ce5fa10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 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/language_codes/build.gradle b/language_codes/build.gradle index 7c54502f100..a582807c4c6 100644 --- a/language_codes/build.gradle +++ b/language_codes/build.gradle @@ -5,3 +5,11 @@ plugins { } apply from: "$mppProjectWithSerializationPresetPath" + +kotlin { + sourceSets { + jvmMain { + dependsOn androidMain + } + } +} 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()) From 2d68321503ad274f1d9be98835cdb72631a7ed5d Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 20 Feb 2023 00:19:27 +0600 Subject: [PATCH 3/3] Update build.gradle --- language_codes/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language_codes/build.gradle b/language_codes/build.gradle index a582807c4c6..8515ddb2e83 100644 --- a/language_codes/build.gradle +++ b/language_codes/build.gradle @@ -8,8 +8,8 @@ apply from: "$mppProjectWithSerializationPresetPath" kotlin { sourceSets { - jvmMain { - dependsOn androidMain + androidMain { + dependsOn jvmMain } } }