remove libphonenumber-compose module. use androidx-startup-runtime

androidx-startup-runtime supplies application context

libphonenumber/build.gradle.kts

@@ -80,6 +80,9 @@ kotlin {
  }
  val androidMain by getting {
  dependsOn(jvmCommonMain)
+ dependencies {
+ implementation(libs.androidx.startup.runtime)
+ }
  }
  val nonJvmMain by creating {
  dependsOn(commonMain)

libphonenumber/src/androidMain/AndroidManifest.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <application>
+
+ <provider
+ android:name="androidx.startup.InitializationProvider"
+ android:authorities="${applicationId}.androidx-startup"
+ android:exported="false"
+ tools:node="merge">
+
+ <meta-data
+ android:name="io.michaelrocks.libphonenumber.kotlin.ApplicationContextInitializer"
+ android:value="androidx.startup" />
+ </provider>
+
+ </application>
+</manifest>

libphonenumber/src/androidMain/kotlin/io/michaelrocks/libphonenumber/kotlin/ApplicationContextInitializer.kt

@@ -0,0 +1,15 @@
+package io.michaelrocks.libphonenumber.kotlin
+
+import android.content.Context
+import androidx.startup.Initializer
+
+
+internal lateinit var applicationContext: Context
+
+internal class ApplicationContextInitializer : Initializer<Context> {
+ override fun create(context: Context): Context = context.also {
+ applicationContext = it
+ }
+
+ override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
+}

libphonenumber/src/androidMain/kotlin/io/michaelrocks/libphonenumber/kotlin/metadata/defaultMetadataLoader.android.kt

@@ -1,8 +1,9 @@
 package io.michaelrocks.libphonenumber.kotlin.metadata
 
 import io.michaelrocks.libphonenumber.kotlin.MetadataLoader
+import io.michaelrocks.libphonenumber.kotlin.applicationContext
 import io.michaelrocks.libphonenumber.kotlin.metadata.source.AssetsMetadataLoader
 
-actual fun defaultMetadataLoader(context: Any?): MetadataLoader {
- return AssetsMetadataLoader((context as android.content.Context).assets)
+actual fun defaultMetadataLoader(): MetadataLoader {
+ return AssetsMetadataLoader(applicationContext.assets)
 }

libphonenumber/src/commonMain/kotlin/io/michaelrocks/libphonenumber/kotlin/metadata/defaultMetadataLoader.kt

@@ -2,4 +2,4 @@ package io.michaelrocks.libphonenumber.kotlin.metadata
 
 import io.michaelrocks.libphonenumber.kotlin.MetadataLoader
 
-expect fun defaultMetadataLoader(context: Any? = null): MetadataLoader
+expect fun defaultMetadataLoader(): MetadataLoader

libphonenumber/src/jsMain/kotlin/io/michaelrocks/libphonenumber/kotlin/metadata/defaultMetadataLoader.js.kt

@@ -3,6 +3,6 @@ package io.michaelrocks.libphonenumber.kotlin.metadata
 import io.michaelrocks.libphonenumber.kotlin.MetadataLoader
 import io.michaelrocks.libphonenumber.kotlin.metadata.init.MokoAssetResourceMetadataLoader
 
-actual fun defaultMetadataLoader(context: Any?): MetadataLoader {
+actual fun defaultMetadataLoader(): MetadataLoader {
  return MokoAssetResourceMetadataLoader()
 }

libphonenumber/src/jvmMain/kotlin/io/michaelrocks/libphonenumber/kotlin/metadata/defaultMetadataLoader.jvm.kt

@@ -3,6 +3,6 @@ package io.michaelrocks.libphonenumber.kotlin.metadata
 import io.michaelrocks.libphonenumber.kotlin.MetadataLoader
 import io.michaelrocks.libphonenumber.kotlin.metadata.init.ClassPathResourceMetadataLoader
 
-actual fun defaultMetadataLoader(context: Any?): MetadataLoader {
+actual fun defaultMetadataLoader(): MetadataLoader {
  return ClassPathResourceMetadataLoader()
 }

libphonenumber/src/nativeMain/kotlin/io/michaelrocks/libphonenumber/kotlin/metadata/defaultMetadataLoader.native.kt

@@ -3,6 +3,6 @@ package io.michaelrocks.libphonenumber.kotlin.metadata
 import io.michaelrocks.libphonenumber.kotlin.MetadataLoader
 import io.michaelrocks.libphonenumber.kotlin.metadata.init.MokoAssetResourceMetadataLoader
 
-actual fun defaultMetadataLoader(context: Any?): MetadataLoader {
+actual fun defaultMetadataLoader(): MetadataLoader {
  return MokoAssetResourceMetadataLoader()
 }

sample/build.gradle.kts

@@ -102,7 +102,6 @@ kotlin {
  implementation(compose.runtime)
  implementation(libs.dev.icerock.moko.resources)
  implementation(project(":libphonenumber"))
- implementation(project(":libphonenumber-compose"))
  }
  }
 

sample/src/commonMain/kotlin/App.kt

@@ -18,7 +18,9 @@ import io.michaelrocks.libphonenumber.kotlin.metadata.defaultMetadataLoader
 
 @Composable
 fun App(platform: String) {
- val phoneNumberUtil = phoneNumberUtil()
+ val phoneNumberUtil: PhoneNumberUtil by remember {
+ mutableStateOf(PhoneNumberUtil.createInstance(defaultMetadataLoader()))
+ }
  var text by remember { mutableStateOf("Hello, World!") }
  var examplePhoneNumberToFormat by remember { mutableStateOf("8005551212") }
  var examplePhoneNumberFormatted by remember { mutableStateOf(false) }

settings.gradle.kts

@@ -25,6 +25,5 @@ plugins {
 }
 
 include(":libphonenumber")
-include(":libphonenumber-compose")
 include(":library-test-resources")
 include(":sample")