Merge branch 'main' into local-evaluation

amplitude · Oct 9, 2023 · 7038561 · 7038561
2 parents f031f8a + 3c4bcfd
commit 7038561
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -76,11 +76,11 @@ jobs:
         run: |
           npx \
           -p lodash \
-          -p semantic-release@17 \
-          -p @semantic-release/changelog@5 \
-          -p @semantic-release/git@9 \
-          -p @google/semantic-release-replace-plugin@1 \
-          -p @semantic-release/exec@5 \
+          -p semantic-release \
+          -p @semantic-release/changelog \
+          -p @semantic-release/git \
+          -p @google/semantic-release-replace-plugin \
+          -p @semantic-release/exec \
           semantic-release --dry-run
 
       - name: Semantic Release
@@ -94,9 +94,9 @@ jobs:
         run: |
           npx \
           -p lodash \
-          -p semantic-release@17 \
-          -p @semantic-release/changelog@5 \
-          -p @semantic-release/git@9 \
-          -p @google/semantic-release-replace-plugin@1 \
-          -p @semantic-release/exec@5 \
+          -p semantic-release \
+          -p @semantic-release/changelog \
+          -p @semantic-release/git \
+          -p @google/semantic-release-replace-plugin \
+          -p @semantic-release/exec \
           semantic-release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.10.1](https://github.com/amplitude/experiment-android-client/compare/1.10.0...1.10.1) (2023-09-26)
+
+
+### Bug Fixes
+
+* Catch JSONException from parsing vardata response ([#33](https://github.com/amplitude/experiment-android-client/issues/33)) ([cabbb5d](https://github.com/amplitude/experiment-android-client/commit/cabbb5dae19620e37b3877cffaa1fe35061ee97d))
+
 # [1.10.0](https://github.com/amplitude/experiment-android-client/compare/1.9.0...1.10.0) (2023-06-02)
 
 

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -9,7 +9,7 @@ ext {
     PUBLISH_NAME = 'Experiment Android SDK'
     PUBLISH_DESCRIPTION = 'Amplitude Experiment client-side SDK for Android'
     PUBLISH_GROUP_ID = 'com.amplitude'
-    PUBLISH_VERSION = '1.10.0'
+    PUBLISH_VERSION = '1.10.1'
     PUBLISH_ARTIFACT_ID = 'experiment-android-client'
 }
 

diff --git a/sdk/src/main/java/com/amplitude/experiment/DefaultExperimentClient.kt b/sdk/src/main/java/com/amplitude/experiment/DefaultExperimentClient.kt
@@ -46,6 +46,7 @@ private const val EU_SERVER_URL = "https://api.lab.eu.amplitude.com/"
 private const val EU_FLAGS_SERVER_URL = "https://flag.lab.eu.amplitude.com/"
 private const val FLAG_POLLER_INTERVAL_MILLIS: Long = 60000
 
+
 internal class DefaultExperimentClient internal constructor(
     private val apiKey: String,
     private val config: ExperimentConfig,
@@ -351,8 +352,8 @@ internal class DefaultExperimentClient internal constructor(
                     Logger.d("Received fetch variants response: $response")
                     val variants = parseResponse(response)
                     future.complete(variants)
-                } catch (e: IOException) {
-                    onFailure(call, e)
+                } catch (e: Exception) {
+                    future.completeExceptionally(e)
                 }
             }