Merge branch 'master' into next-release

Author: gwhelanLD

CHANGELOG.md

@@ -3,6 +3,13 @@
 
 All notable changes to the LaunchDarkly Android SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
 
+## [2.8.5] - 2019-07-29
+### Added:
+- Added a CircleCI badge to the project readme.
+### Fixed
+- Fix a bug introduced in 2.8.0 that could cause the SDK to enter a bad state where it would no longer connect to the flag stream if `identify()` was called rapidly.
+- Reverted an unintentional behavior change introduced in 2.8.0 when `LDClient.init` is given zero as the timeout argument. Before 2.8.0, this would not wait for initialization and return the client immediately. For 2.8.0-2.8.4 this was changed to wait indefinitely for initialization, 2.8.5 restores the earlier behavior.
+
 ## [2.8.4] - 2019-06-14
 ### Fixed
 - Deadlock when waiting on main thread for `identify` call.

example/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation project(path: ':launchdarkly-android-client-sdk')
     // Comment the previous line and uncomment this one to depend on the published artifact:
-    //implementation 'com.launchdarkly:launchdarkly-android-client-sdk:2.8.4'
+    //implementation 'com.launchdarkly:launchdarkly-android-client-sdk:2.8.5'
 
     implementation 'com.jakewharton.timber:timber:4.7.1'
 

launchdarkly-android-client-sdk/build.gradle

@@ -7,7 +7,7 @@ apply plugin: 'io.codearte.nexus-staging'
 
 allprojects {
     group = 'com.launchdarkly'
-    version = '2.8.4'
+    version = '2.8.5'
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 }