DigitalBuddha 774e9d9c4b Merge remote-tracking branch 'origin/feature/kotlin_conversion' into feature/coroutines ... # Conflicts: # app/build.gradle # app/src/main/java/com/nytimes/android/sample/SampleApp.kt # app/src/main/java/com/nytimes/android/sample/activity/PersistingStoreActivity.java # app/src/main/java/com/nytimes/android/sample/activity/StoreActivity.java # build.gradle # buildsystem/dependencies.gradle # filesystem/src/test/java/com/nytimes/android/external/fs3/FilePersisterTest.java # filesystem/src/test/java/com/nytimes/android/external/fs3/FileSystemRecordPersisterTest.java # filesystem/src/test/java/com/nytimes/android/external/fs3/RecordPersisterTest.java # filesystem/src/test/java/com/nytimes/android/external/fs3/SourcePersisterTest.java # middleware/src/main/java/com/nytimes/android/external/store3/middleware/GsonParserFactory.kt # middleware/src/main/java/com/nytimes/android/external/store3/middleware/GsonReaderParser.kt # middleware/src/main/java/com/nytimes/android/external/store3/middleware/GsonSourceParser.kt # middleware/src/main/java/com/nytimes/android/external/store3/middleware/GsonStringParser.kt # middleware/src/test/java/com/nytimes/android/external/store3/GenericParserStoreTest.java # middleware/src/test/java/com/nytimes/android/external/store3/GsonParserFactoryTest.java # middleware/src/test/java/com/nytimes/android/external/store3/GsonSourceListParserTest.java # store/build.gradle		2019-02-10 19:29:48 -05:00
..
src	Merge remote-tracking branch 'origin/feature/kotlin_conversion' into feature/coroutines	2019-02-10 19:29:48 -05:00
.gitignore	initialCommit	2016-11-29 13:59:48 -05:00
build.gradle	middleware conversion to kotlin (#351)	2018-07-11 14:02:33 -04:00
gradle.properties	Refactor package name to store3 for the Rx2 branch (#220)	2017-05-23 13:27:32 -04:00
version.properties	Include develop changes in Rx2 branch (#214)	2017-05-19 10:25:04 -04:00