| OLD | NEW |
| 1 ## 1.13.0 | 1 ## 1.13.0 |
| 2 | 2 |
| 3 <<<<<<< ours |
| 3 * Add `collectBytes` and `collectBytesCancelable` functions which collects | 4 * Add `collectBytes` and `collectBytesCancelable` functions which collects |
| 4 list-of-byte events into a single byte list. | 5 list-of-byte events into a single byte list. |
| 5 | 6 |
| 6 * Fix a bug where rejecting a `StreamQueueTransaction` would throw a | 7 * Fix a bug where rejecting a `StreamQueueTransaction` would throw a |
| 7 `StateError` if `StreamQueue.rest` had been called on one of its child queues. | 8 `StateError` if `StreamQueue.rest` had been called on one of its child queues. |
| 8 | 9 |
| 9 * `StreamQueue.withTransaction()` now properly returns whether or not the | 10 * `StreamQueue.withTransaction()` now properly returns whether or not the |
| 10 transaction was committed. | 11 transaction was committed. |
| 12 ======= |
| 13 * Add a `collectBytes` function which collects list-of-byte events into |
| 14 a single byte list. |
| 15 * Switched to using generic method syntax. |
| 16 >>>>>>> theirs |
| 11 | 17 |
| 12 ## 1.12.0 | 18 ## 1.12.0 |
| 13 | 19 |
| 14 * Add an `AsyncCache` class that caches asynchronous operations for a period of | 20 * Add an `AsyncCache` class that caches asynchronous operations for a period of |
| 15 time. | 21 time. |
| 16 | 22 |
| 17 * Add `StreamQueue.peek` and `StreamQueue.lookAheead`. | 23 * Add `StreamQueue.peek` and `StreamQueue.lookAheead`. |
| 18 These allow users to look at events without consuming them. | 24 These allow users to look at events without consuming them. |
| 19 | 25 |
| 20 * Add `StreamQueue.startTransaction()` and `StreamQueue.withTransaction()`. | 26 * Add `StreamQueue.startTransaction()` and `StreamQueue.withTransaction()`. |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 - Added a `StreamSplitter` class for splitting a stream into multiple new | 173 - Added a `StreamSplitter` class for splitting a stream into multiple new |
| 168 streams. | 174 streams. |
| 169 | 175 |
| 170 ## 1.1.1 | 176 ## 1.1.1 |
| 171 | 177 |
| 172 - Updated SDK version constraint to at least 1.9.0. | 178 - Updated SDK version constraint to at least 1.9.0. |
| 173 | 179 |
| 174 ## 1.1.0 | 180 ## 1.1.0 |
| 175 | 181 |
| 176 - ChangeLog starts here. | 182 - ChangeLog starts here. |
| OLD | NEW |