Merge pull request #15 from studyplus/update_circleci_config

Modify path where search bundle cache

Author: koji-1009

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 executors:
   default:
     docker:
-      - image: circleci/android:api-28
+      - image: circleci/android:api-27
     environment:
       JAVA_OPTS: -Xmx3200m
 
@@ -22,7 +22,7 @@ commands:
     steps:
       - run:
           name: Run Tests
-          command: ./gradlew lint test
+          command: ./gradlew studyplus-android-sdk2:lint studyplus-android-sdk2:test
       - store_artifacts:
           path: studyplus-android-sdk2/build/reports
           destination: reports
@@ -35,7 +35,7 @@ commands:
           key: v1-danger-cache-{{ checksum "Gemfile.lock" }}
       - run:
           name: Bundle install for Danger and fastlane
-          command: bundle check || bundle install --path vendor/bundle --clean
+          command: bundle check --path vendor/bundle || bundle install --jobs=4 --retry=3 --path vendor/bundle --clean
       - save_cache:
           paths:
             - vendor/bundle
@@ -47,23 +47,24 @@ commands:
           command: bundle exec danger
 
 jobs:
-  run_test:
+  unit_test:
     executor:
       name: default
     steps:
       - checkout
       - setup_android
       - unit_test
-  run_danger:
+  check_pr:
     executor:
       name: default
     steps:
       - checkout
+      - setup_android
       - setup_bundle
       - run_danger
 
 workflows:
   pull_request:
     jobs:
-      - run_test
-      - run_danger
+      - unit_test
+      - check_pr

Dangerfile

@@ -29,6 +29,6 @@ warn("A pull request must have some assignees") if github.pr_json["assignee"].ni
 #
 ####
 android_lint.gradle_task = "studyplus-android-sdk2:lint"
-android_lint.report_file = "studyplus-android-sdk2/build/reports/lint/lint-result.xml"
+android_lint.report_file = "studyplus-android-sdk2/build/reports/lint-results.xml"
 android_lint.filtering = true
 android_lint.lint(inline_mode: true)

studyplus-android-sdk2/build.gradle

@@ -66,6 +66,10 @@ android {
             includeAndroidResources = true
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {