refactor(adapter): move Locale adapters to dedicated module

Extract shared JVM and Android Locale adapters with their tests from polyglot-core.

Author: aartiPl

build.gradle.kts

@@ -30,7 +30,7 @@ fun calculateVersion(baseVersion: String): String {
 }
 
 group = "net.igsoft.polyglot"
-version = calculateVersion("0.3.1")
+version = calculateVersion("0.3.2")
 
 println("Version: $version")
 

polyglot-adapter/build.gradle.kts

@@ -0,0 +1,91 @@
+plugins {
+    kotlin("multiplatform")
+    id("com.android.kotlin.multiplatform.library")
+    id("com.adarshr.test-logger")
+    id("com.vanniktech.maven.publish")
+}
+
+kotlin {
+    applyDefaultHierarchyTemplate()
+
+    jvm()
+    android {
+        namespace = "net.igsoft.polyglot.adapter"
+        compileSdk = 37
+        minSdk = 23
+        withHostTest {}
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
+    }
+    jvmToolchain(17)
+
+    sourceSets {
+        val jvmAndroidMain = create("jvmAndroidMain") {
+            dependsOn(commonMain.get())
+        }
+        jvmMain.get().dependsOn(jvmAndroidMain)
+        androidMain.get().dependsOn(jvmAndroidMain)
+
+        val jvmAndroidTest = create("jvmAndroidTest") {
+            dependsOn(commonTest.get())
+        }
+        jvmTest.get().dependsOn(jvmAndroidTest)
+        getByName("androidHostTest").dependsOn(jvmAndroidTest)
+
+        commonMain.dependencies {
+            api(project(":polyglot-core"))
+        }
+
+        commonTest.dependencies {
+            implementation(kotlin("test"))
+        }
+
+        jvmTest.dependencies {
+            implementation(kotlin("test-junit5"))
+            runtimeOnly("org.junit.platform:junit-platform-launcher")
+        }
+    }
+}
+
+testlogger {
+    showStandardStreams = true
+    showFullStackTraces = false
+}
+
+val licensesSpec = Action<MavenPomLicenseSpec> {
+    license {
+        name.set("MIT License")
+        url.set("https://opensource.org/licenses/MIT")
+    }
+}
+
+val developersSpec = Action<MavenPomDeveloperSpec> {
+    developer {
+        id.set("aartiPl")
+        name.set("Marcin Kuszczak")
+        email.set("aarti@interia.pl")
+    }
+}
+
+val scmSpec = Action<MavenPomScm> {
+    connection.set("scm:git:git://https://github.com/aartiPl/polyglot.git")
+    developerConnection.set("scm:git:ssh:https://github.com/aartiPl/polyglot.git")
+    url.set("https://github.com/aartiPl/polyglot/tree/main")
+}
+
+mavenPublishing {
+    coordinates(group.toString(), project.name, version.toString())
+    publishToMavenCentral()
+    signAllPublications()
+
+    pom {
+        name.set(project.name)
+        description.set("JVM and Android adapters for Polyglot")
+        url.set("https://github.com/aartiPl/polyglot")
+
+        licenses(licensesSpec)
+        developers(developersSpec)
+        scm(scmSpec)
+    }
+}

…igsoft/polyglot/core/MsgLocaleAndroid.kt …igsoft/polyglot/adapter/MsgLocaleJava.ktpolyglot-core/src/androidMain/kotlin/net/igsoft/polyglot/core/MsgLocaleAndroid.kt renamed to polyglot-adapter/src/jvmAndroidMain/kotlin/net/igsoft/polyglot/adapter/MsgLocaleJava.kt polyglot-core/src/androidMain/kotlin/net/igsoft/polyglot/core/MsgLocaleAndroid.kt renamed to polyglot-adapter/src/jvmAndroidMain/kotlin/net/igsoft/polyglot/adapter/MsgLocaleJava.kt

@@ -1,6 +1,7 @@
-package net.igsoft.polyglot.core
+package net.igsoft.polyglot.adapter
 
 import java.util.Locale
+import net.igsoft.polyglot.core.MsgLocale
 
 fun MsgLocale.Companion.of(locale: Locale): MsgLocale = MsgLocale.of(locale.toLanguageTag())
 

polyglot-adapter/src/jvmAndroidTest/kotlin/net/igsoft/polyglot/adapter/MsgLocaleJavaTest.kt

@@ -0,0 +1,45 @@
+package net.igsoft.polyglot.adapter
+
+import java.util.Locale
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import net.igsoft.polyglot.core.MsgLocale
+import net.igsoft.polyglot.core.MsgLocales
+
+class MsgLocaleJavaTest {
+
+    @Test
+    fun `Given French locale when converting to message locale then preserve language tag`() {
+        assertEquals(MsgLocale.of("fr-FR"), Locale.forLanguageTag("fr-FR").toMsgLocale())
+    }
+
+    @Test
+    fun `Given French message locale when converting to Java locale then preserve language tag`() {
+        assertEquals(Locale.forLanguageTag("fr-FR"), MsgLocale.of("fr-FR").toJavaLocale())
+    }
+
+    @Test
+    fun `Given German locale when creating message locale then preserve language tag`() {
+        assertEquals(MsgLocale.of("de"), MsgLocale.of(Locale.GERMAN))
+    }
+
+    @Test
+    fun `Given java locale when converting to message locale then normalize language tag`() {
+        val javaLocale = Locale.forLanguageTag("pl-PL-u-ca-gregory")
+
+        assertEquals("pl-PL", javaLocale.toMsgLocale().languageTag)
+    }
+
+    @Test
+    @Suppress("DEPRECATION")
+    fun `Given empty java locale when converting to message locale then return undetermined tag`() {
+        val javaLocale = Locale("", "")
+
+        assertEquals("und", MsgLocale.of(javaLocale).languageTag)
+    }
+
+    @Test
+    fun `Given message locale when converting to java locale then preserve language tag`() {
+        assertEquals("en-US", MsgLocales.EN_US.toJavaLocale().toLanguageTag())
+    }
+}

polyglot-core/src/androidHostTest/kotlin/net/igsoft/polyglot/core/MsgLocaleAndroidTest.kt

@@ -18,4 +18,5 @@ dependencyResolutionManagement {
 rootProject.name = "polyglot"
 
 include(":polyglot-core")
-include(":polyglot-compose")
+include(":polyglot-adapter")
+include(":polyglot-compose")