Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.circleci/config.yml

.circleci/config.yml

@@ -3,31 +3,33 @@ jobs:
   build:
     working_directory: ~/code
     docker:
-      - image: circleci/android:api-28-alpha
+    - image: circleci/android:api-28-alpha
     environment:
-      JVM_OPTS: -Xmx3200m
+    - JVM_OPTS: -Xmx3200m
     steps:
-      - checkout
+    - checkout
-      - restore_cache:
+    - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+        key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - run:
+    - run:
-          name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
+        name: Chmod permissions
-          command: sudo chmod +x ./gradlew
+        command: sudo chmod +x ./gradlew
-      - run:
+    - run:
-          name: Download Dependencies
+        name: Download Dependencies
-          command: ./gradlew androidDependencies
+        command: ./gradlew androidDependencies
-      - save_cache:
+    - save_cache:
-          paths:
+        paths:
-            - ~/.gradle
+        - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+        key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
-      - run:
+    - run:
-          #          name: Run UnitTest
+        name: Run Tests
-          #          command: ./gradlew ExampleInstrumentedTest
+        command: ./gradlew lint test
-          name: Run Tests
+    - store_artifacts:
-          command: ./gradlew lint test
+        path: app/build/reports
-      - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
+        destination: reports
-          path: app/build/reports
+    - store_test_results:
-          destination: reports
+        path: app/build/test-results
-      - store_test_results: # for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
+workflows:
-          path: app/build/test-results
+  version: 2
-      # See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples
+  workflow:
+    jobs:
+    - build

README.md

@@ -4,20 +4,20 @@ A list of all the github repos of Square. This android app shows a list of all c
 
 ## Requirements
 
-Minimum android SDK version 15, Android 4.0.3 (Icecream Sandwich)
+Minimum android SDK version 23, Android 6.0.0 (Marshmellow)
 Permissions : Internet
 
 ## Features
 
  - Swipe to refresh view
  - Search option
- - Sort option
+ - Open repo on click
+ - Display language of repo (if available)
 
 ## Espresso UI tests
 
 ### Test case one
  - Testing listview population
- - Testing swipe to refresh
 
 ### Test case two
  - Testing filter list in searchview
@@ -25,8 +25,8 @@ Permissions : Internet
  
 ## Built With
 
-* [Gson](https://github.com/google/gson) - A Java serialization/deserialization library to convert Java Objects into JSON and back
+* [RxJava](https://github.com/ReactiveX/RxJava) - RxJava – Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM.
-* [OkHttp](https://square.github.io/okhttp/) - An HTTP client for Android, Kotlin, and Java.
+* [Retrofit](https://github.com/square/retrofit) - Type-safe HTTP client for Android and Java by Square, Inc
 
 ## Authors