chore: upgrade openfeature kotlin sdk (#274)

Co-authored-by: Bence Hornák <[email protected]>

Author: jonathannorris

README.md

@@ -28,7 +28,7 @@ The DevCycle Android SDK includes support for [OpenFeature](https://openfeature.
 
 ```kotlin
 import com.devcycle.sdk.android.openfeature.DevCycleProvider
-import dev.openfeature.sdk.OpenFeatureAPI
+import dev.openfeature.kotlin.sdk.OpenFeatureAPI
 
 // Initialize the DevCycle provider
 val provider = DevCycleProvider(

android-client-sdk/build.gradle

@@ -138,8 +138,8 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_reflect_version")
     implementation("androidx.core:core-ktx:$androidx_version")
 
-    // OpenFeature Android SDK
-    implementation("dev.openfeature:android-sdk:0.4.1")
+    // OpenFeature Kotlin SDK
+    implementation("dev.openfeature:kotlin-sdk:0.6.2")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junit_version")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit_version")

android-client-sdk/proguard-rules.pro

@@ -118,5 +118,5 @@
 
 # OpenFeature integration classes
 -keep class com.devcycle.sdk.android.openfeature.** { *; }
--keep class dev.openfeature.sdk.** { *; }
--dontwarn dev.openfeature.sdk.**
+-keep class dev.openfeature.kotlin.sdk.** { *; }
+-dontwarn dev.openfeature.kotlin.sdk.**

android-client-sdk/src/main/java/com/devcycle/sdk/android/openfeature/DevCycleContextMapper.kt

@@ -1,9 +1,8 @@
 package com.devcycle.sdk.android.openfeature
 
 import com.devcycle.sdk.android.model.DevCycleUser
-import com.devcycle.sdk.android.util.DevCycleLogger
-import dev.openfeature.sdk.EvaluationContext
-import dev.openfeature.sdk.Value
+import dev.openfeature.kotlin.sdk.EvaluationContext
+import dev.openfeature.kotlin.sdk.Value
 
 object DevCycleContextMapper {
 
@@ -15,7 +14,7 @@ object DevCycleContextMapper {
         var hasStandardAttributes = false
         var isAnonymousExplicitlySet = false
 
-        context.getTargetingKey()?.takeIf { it.isNotEmpty() }?.let {
+        context.getTargetingKey().takeIf { it.isNotEmpty() }?.let {
             userId = it
         } ?: run {
             context.getValue("user_id")?.takeIf { it is Value.String }?.asString()?.let {
@@ -176,14 +175,14 @@ object DevCycleContextMapper {
             is Value.Structure -> {
                 // Access structure directly
                 val structureMap = value.structure
-                structureMap?.mapValues { (_, v) -> 
-                    convertValueToAny(v) 
-                }?.filterValues { it != null }
+                structureMap.mapValues { (_, v) ->
+                    convertValueToAny(v)
+                }.filterValues { it != null }
             }
             is Value.List -> {
                 // Access list directly
                 val list = value.list
-                list?.mapNotNull { convertValueToAny(it) } ?: emptyList<Any>()
+                list.mapNotNull { convertValueToAny(it) }
             }
             else -> {
                 // Ensure the string representation is safe

android-client-sdk/src/main/java/com/devcycle/sdk/android/openfeature/DevCycleEventMapper.kt

@@ -1,9 +1,8 @@
 package com.devcycle.sdk.android.openfeature
 
 import com.devcycle.sdk.android.model.DevCycleEvent
-import com.devcycle.sdk.android.util.DevCycleLogger
-import dev.openfeature.sdk.TrackingEventDetails
-import dev.openfeature.sdk.Value
+import dev.openfeature.kotlin.sdk.TrackingEventDetails
+import dev.openfeature.kotlin.sdk.Value
 import java.math.BigDecimal
 
 object DevCycleEventMapper {
@@ -55,14 +54,14 @@ object DevCycleEventMapper {
             is Value.Structure -> {
                 // Recursively unwrap nested structure
                 val structureMap = value.structure
-                structureMap?.mapValues { (_, v) -> 
+                structureMap.mapValues { (_, v) ->
                     unwrapValue(v) 
-                }?.filterValues { it != null }
+                }.filterValues { it != null }
             }
             is Value.List -> {
                 // Recursively unwrap nested list
                 val list = value.list
-                list?.mapNotNull { unwrapValue(it) }
+                list.mapNotNull { unwrapValue(it) }
             }
             else -> null
         }

android-client-sdk/src/main/java/com/devcycle/sdk/android/openfeature/DevCycleProvider.kt

@@ -8,8 +8,8 @@ import com.devcycle.sdk.android.model.BaseConfigVariable
 import com.devcycle.sdk.android.model.DevCycleUser
 import com.devcycle.sdk.android.model.Variable
 import com.devcycle.sdk.android.util.DevCycleLogger
-import dev.openfeature.sdk.*
-import dev.openfeature.sdk.exceptions.OpenFeatureError
+import dev.openfeature.kotlin.sdk.*
+import dev.openfeature.kotlin.sdk.exceptions.OpenFeatureError
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.json.JSONArray
 import org.json.JSONObject

android-client-sdk/src/main/java/com/devcycle/sdk/android/openfeature/DevCycleProviderMetadata.kt

@@ -1,6 +1,6 @@
 package com.devcycle.sdk.android.openfeature
 
-import dev.openfeature.sdk.ProviderMetadata
+import dev.openfeature.kotlin.sdk.ProviderMetadata
 
 class DevCycleProviderMetadata(
     override val name: String = "DevCycle"

android-client-sdk/src/main/java/com/devcycle/sdk/android/openfeature/JsonValueConverter.kt

@@ -1,6 +1,6 @@
 package com.devcycle.sdk.android.openfeature
 
-import dev.openfeature.sdk.Value
+import dev.openfeature.kotlin.sdk.Value
 import org.json.JSONArray
 import org.json.JSONObject
 

android-client-sdk/src/test/java/com/devcycle/sdk/android/openfeature/DevCycleContextMapperTest.kt

@@ -2,8 +2,8 @@ package com.devcycle.sdk.android.openfeature
 
 import com.devcycle.sdk.android.util.JSONMapper
 import com.fasterxml.jackson.core.type.TypeReference
-import dev.openfeature.sdk.ImmutableContext
-import dev.openfeature.sdk.Value
+import dev.openfeature.kotlin.sdk.ImmutableContext
+import dev.openfeature.kotlin.sdk.Value
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Assertions.*
 

android-client-sdk/src/test/java/com/devcycle/sdk/android/openfeature/DevCycleEventMapperTest.kt

@@ -2,9 +2,9 @@ package com.devcycle.sdk.android.openfeature
 
 import com.devcycle.sdk.android.util.JSONMapper
 import com.fasterxml.jackson.core.type.TypeReference
-import dev.openfeature.sdk.ImmutableStructure
-import dev.openfeature.sdk.TrackingEventDetails
-import dev.openfeature.sdk.Value
+import dev.openfeature.kotlin.sdk.ImmutableStructure
+import dev.openfeature.kotlin.sdk.TrackingEventDetails
+import dev.openfeature.kotlin.sdk.Value
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Assertions.*
 import java.math.BigDecimal