From 095dae078e294babcd7a908e1737133f1263553e Mon Sep 17 00:00:00 2001
From: Manuel <trezza.m@gmail.com>
Date: Thu, 18 Jun 2020 19:01:09 +0200
Subject: [PATCH] fixed name change of bolts dependency (#111)

* fixed name change of bolts dependency

* added change log

* removed project file

* Trigger Travis CI
---
 CHANGELOG.md                                  | 44 +++++++++++++++++++
 ParseLiveQuery/build.gradle                   |  2 +-
 .../livequery/ParseLiveQueryClientImpl.java   |  4 +-
 .../com/parse/TestParseLiveQueryClient.java   |  2 +-
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..4eefa50
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,44 @@
+## Changelog
+
+### master
+
+### 1.2.1
+> NOTE:
+>
+> This release requires Parse Android SDK >=`1.24.2` as dependency because of the transient depencency on the internalized bolts module.
+- CHANGE: Changed bolts references to use internalized bolts depedency. See [#1036](https://github.com/parse-community/Parse-SDK-Android/issues/1036) for details. Thanks to [Manuel Trezza](https://github.com/mtrezza)
+
+### 1.2.0
+- Upgrade to avoid depending on outdated Bolts (#107)
+
+### 1.1.0
+- Repackage from com.parse to com.parse.livequery
+- Bumps to use the latest dependency on JitPack for compatibility
+
+### 1.0.6
+- Safely call close on the websocket client with synchronized calls
+thanks to @mmimeault (#83)
+
+### 1.0.5
+- Back the subscriptions by a thread safe collection map thanks to @mmimeault (#80)
+
+### 1.0.4
+- Change package name thanks to @hermanliang (#64)
+
+### 1.0.3
+- Fix race condition by ensuring that op=connected has been received before sending a new subscribe event thanks to @jhansche (#48)
+
+### 1.0.2
+- Dispatch better disconnect events thanks to @jhansche (#39)
+
+### 1.0.1
+- getClient() method can get URL inferred from Parse.initialize() call thanks to @hermanliang (#30)
+- Bump to support Android API 25 (#32)
+- Bump to Parse Android 1.14.1 dependency (#32).
+- Switch from TubeSock library to OkHttp3 web scokets (#28)
+- Fix Locale lint errors thanks to @jhansche (#23)
+- Connect/disconnect on background executor thanks to @jhansche (#22)
+- Refactor ParseLiveQueryClient not to be typed thanks to @jhansche (#27)
+
+### 1.0.0
+- Initial 1.0.0 release
\ No newline at end of file
diff --git a/ParseLiveQuery/build.gradle b/ParseLiveQuery/build.gradle
index f064079..5ae40df 100644
--- a/ParseLiveQuery/build.gradle
+++ b/ParseLiveQuery/build.gradle
@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    api "com.github.parse-community.Parse-SDK-Android:parse:1.24.1"
+    api "com.github.parse-community.Parse-SDK-Android:parse:1.24.2"
     api "com.squareup.okhttp3:okhttp:3.14.4"
 
     testImplementation "org.robolectric:robolectric:3.3.1"
diff --git a/ParseLiveQuery/src/main/java/com/parse/livequery/ParseLiveQueryClientImpl.java b/ParseLiveQuery/src/main/java/com/parse/livequery/ParseLiveQueryClientImpl.java
index b736c7e..ef7284b 100644
--- a/ParseLiveQuery/src/main/java/com/parse/livequery/ParseLiveQueryClientImpl.java
+++ b/ParseLiveQuery/src/main/java/com/parse/livequery/ParseLiveQueryClientImpl.java
@@ -22,8 +22,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 
-import bolts.Continuation;
-import bolts.Task;
+import com.parse.boltsinternal.Continuation;
+import com.parse.boltsinternal.Task;
 import okhttp3.OkHttpClient;
 
 class ParseLiveQueryClientImpl implements ParseLiveQueryClient {
diff --git a/ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java b/ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java
index 11af858..2738d15 100644
--- a/ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java
+++ b/ParseLiveQuery/src/test/java/com/parse/TestParseLiveQueryClient.java
@@ -24,7 +24,7 @@
 import java.io.IOException;
 import java.net.URI;
 
-import bolts.Task;
+import com.parse.boltsinternal.Task;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;