Merge branch 'main' into v2

amplitude · Jan 25, 2024 · d692980 · d692980
2 parents 4e39e9c + 417b709
commit d692980
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [1.2.4](https://github.com/amplitude/experiment-jvm-server/compare/1.2.3...1.2.4) (2023-11-29)
+
+
+### Bug Fixes
+
+* local evaluation flag config ConcurrentModificationException ([#16](https://github.com/amplitude/experiment-jvm-server/issues/16)) ([7c5353f](https://github.com/amplitude/experiment-jvm-server/commit/7c5353f2c9d24e3ef9a9ec00bdc40b5953f9c1d2))
+
+## [1.2.3](https://github.com/amplitude/experiment-jvm-server/compare/1.2.2...1.2.3) (2023-11-28)
+
+
+### Bug Fixes
+
+* Flag segment serialization error ([#15](https://github.com/amplitude/experiment-jvm-server/issues/15)) ([8c6b47e](https://github.com/amplitude/experiment-jvm-server/commit/8c6b47e8df9a42d5b4092fa4db05af1588ce473c))
+
 ## [1.2.2](https://github.com/amplitude/experiment-jvm-server/compare/1.2.1...1.2.2) (2023-10-10)
 
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
 // Publishing
 
 group = "com.amplitude"
-version = "1.2.2"
+version = "1.2.4"
 
 nexusPublishing {
     repositories {

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -2,8 +2,8 @@ object Versions {
     const val gradleNexusPublishPlugin = "1.1.0"
     const val dokkaVersion = "1.4.32"
     const val kotlinLint = "10.3.0"
-    const val serializationPlugin = "1.6.20"
-    const val serializationRuntime = "1.3.2"
+    const val serializationPlugin = "1.8.10"
+    const val serializationRuntime = "1.4.1"
     const val json = "20231013"
     const val okhttp = "4.9.3"
     const val evaluationCore = "2.0.0-beta.2"

diff --git a/src/main/kotlin/Experiment.kt b/src/main/kotlin/Experiment.kt
@@ -4,7 +4,7 @@ import com.amplitude.experiment.util.Logger
 import com.amplitude.experiment.util.SystemLogger
 import java.util.concurrent.Executors
 
-internal const val LIBRARY_VERSION = "1.2.2"
+internal const val LIBRARY_VERSION = "1.2.4"
 
 object Experiment {
 

diff --git a/src/main/kotlin/LocalEvaluationClient.kt b/src/main/kotlin/LocalEvaluationClient.kt
@@ -66,7 +66,7 @@ class LocalEvaluationClient internal constructor(
 
     @JvmOverloads
     fun evaluateV2(user: ExperimentUser, flagKeys: Set<String> = setOf()): Map<String, Variant> {
-        val flagConfigs = flagConfigService.getFlagConfigs()
+        val flagConfigs = flagConfigService.getFlagConfigs().toList()
         val sortedFlagConfigs = topologicalSort(flagConfigs, flagKeys)
         if (sortedFlagConfigs.isEmpty()) {
             return mapOf()