chore: resolve upstream rebase conflicts (#185)

Signed-off-by: Marcin Stepien <marcin.stepien@fluxon.com>

Author: mstepien

kotlin-sdk/src/commonMain/kotlin/dev/openfeature/kotlin/sdk/OpenFeatureClient.kt

@@ -171,9 +171,9 @@ class OpenFeatureClient(
         val options = optionsIn ?: FlagEvaluationOptions(listOf(), mapOf())
         val hints = options.hookHints
         var details = FlagEvaluationDetails(key, defaultValue)
-        val provider = openFeatureAPI.getProvider()
+        val provider = openFeatureAPI.getProvider(domain)
         val mergedHooks: List<Hook<*>> = provider.hooks + options.hooks + hooks + openFeatureAPI.hooks
-        val context = openFeatureAPI.getEvaluationContext()
+        val context = openFeatureAPI.getEvaluationContext(domain)
         val hooksWithContext: List<Pair<Hook<*>, HookContext<T>>> =
             mergedHooks
                 .filter { it.supportsFlagValueType(flagValueType) }

kotlin-sdk/src/commonTest/kotlin/dev/openfeature/kotlin/sdk/ProviderRepositoryTest.kt

@@ -449,7 +449,8 @@ class ProviderRepositoryTest {
             // Trigger Context Update first natively queuing onto IO
             OpenFeatureAPI.setEvaluationContext(
                 testDomain,
-                ImmutableContext(attributes = mapOf("key" to Value.Boolean(true)))
+                ImmutableContext(attributes = mapOf("key" to Value.Boolean(true))),
+                dispatcher = StandardTestDispatcher(testScheduler)
             )
         }
 

kotlin-sdk/src/commonTest/kotlin/dev/openfeature/kotlin/sdk/hooks/LoggingHookTests.kt

@@ -18,7 +18,10 @@ import kotlin.test.assertTrue
 class LoggingHookTests {
 
     private class TestProviderMetadata(override val name: String = "test-provider") : ProviderMetadata
-    private class TestClientMetadata(override val name: String = "test-client") : ClientMetadata
+    private class TestClientMetadata(
+        override val domain: String? = "test-client",
+        override val name: String? = domain
+    ) : ClientMetadata
 
     private fun createHookContext(
         flagKey: String = "test-flag",