Merge branches 'develop' and 'master' of https://github.com/agrosner/…

…DBFlow into develop

� Conflicts:
�	usage2/README.md
�	usage2/rxjavasupport.md
�	usage2/usage/models.md

SUMMARY.md

@@ -28,6 +28,4 @@
  * [5.0 Migration Guide](usage2/5.0-migration-guide.md)
  * [Migration4Guide](usage2/migration4guide.md)
 * [ISSUE\_TEMPLATE](issue_template.md)
-* [.github](.github/README.md)
- * [CONTRIBUTING](.github/contributing.md)
 

usage2/README.md

@@ -12,7 +12,12 @@ abstract class AppDatabase: DBFlowDatabase
 The `@Database` annotation generates a `DatabaseDefinition` which now references your SQLite Database on disk in the file named "AppDatabase.db". You can reference it in code as:
 
 ```java
-val db: DatabaseDefinition = database<AppDatabase>();
+val db = database<AppDatabase>();
+
+// or
+database<AppDatabase> { db ->
+
+}
 ```
 
 To ensure generated code in DBFlow is found by the library, initialize the library in your `Application` class:

usage2/rxjavasupport.md

@@ -2,13 +2,13 @@
 
 RXJava support in DBFlow is an _incubating_ feature and likely to change over time. We support RXJava3 only and have made the extensions + DBFlow compatibility almost identical - save for the changes and where it makes sense in each version.
 
-Currently it supports 
+Currently it supports
 
-1. Any `ModelQueriable` can be wrapped in a `Single`, `Maybe`, or `Flowable` \(to continuously observe changes\). 
+1. Any `ModelQueriable` can be wrapped in a `Single`, `Maybe`, or `Flowable` \(to continuously observe changes\).
 
-2. Single + `List` model `save()`, `insert()`, `update()`, and `delete()`. 
+2. Single + `List` model `save()`, `insert()`, `update()`, and `delete()`.
 
-3. Streaming a set of results from a query 
+3. Streaming a set of results from a query
 
 4. Observing on table changes for specific `ModelQueriable` and providing ability to query from that set repeatedly as needed.
 
@@ -34,7 +34,7 @@ For a single query:
 Using vanilla transactions:
 
 ```kotlin
-(select 
+(select
  from MyTable::class)
  .async(db) { d -> queryList(d) }
  .execute { _, r ->}
@@ -43,11 +43,11 @@ Using vanilla transactions:
 Using RX:
 
 ```kotlin
-(select 
+(select
  from MyTable::class)
  .async(db) { d -> queryList(d) }
  .asSingle()
- .subscribeBy { list -> 
+ .subscribeBy { list ->
  // use list
  }
 ```
@@ -57,10 +57,10 @@ Using RX:
 We can easily observe a query for any table changes \(once per transaction\) while it is active and recompute via:
 
 ```kotlin
-(select 
+(select
  from MyTable::class)
  .asFlowable { db -> queryList(db) }
- .subscribeBy { list -> 
+ .subscribeBy { list ->
  // use list
  }
 ```
@@ -74,8 +74,8 @@ Operations are as easy as:
 ```kotlin
 Person(5, "Andrew Grosner")
  .rxInsert(db) // rxSave, rxUpdate, etc.
- .subscribeBy { rowId -> 
- 
+ .subscribeBy { rowId ->
+
  }
 ```
 
@@ -86,7 +86,7 @@ We can use RX to stream the result set, one at a time from the `ModelQueriable`
 ```kotlin
 (select from TestModel::class)
  .queryStreamResults(db)
- .subscribeBy { model -> 
+ .subscribeBy { model ->
 
  }
 ```