From 7333ffc1b4e889a3961362406ef0b3deb8fae758 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 28 Sep 2019 11:47:52 -0700 Subject: [PATCH] Cleaned up CI configurations. --- .circleci/config.yml | 2 +- .travis.yml | 6 +- app/build.gradle | 6 +- app/lint-baseline.xml | 176 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 5 deletions(-) create mode 100644 app/lint-baseline.xml diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e3a557..0bed214 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ defaults_gradle: &defaults_gradle key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - run: name: Run Tests - command: ./gradlew lint test + command: ./gradlew lint build connectedCheck -PdisablePreDex --stacktrace - store_artifacts: path: app/build/reports destination: reports diff --git a/.travis.yml b/.travis.yml index 4f8e745..81dea86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ before_install: - chmod +x gradlew - echo $GOOGLE_SERVICES | base64 -di > app/google-services.json -after_failure: - - cat $TRAVIS_BUILD_DIR/app/build/outputs/lint-results-debug.xml +# after_failure: +# - cat app/build/reports/lint-results.xml script: - - ./gradlew clean build connectedCheck -PdisablePreDex --stacktrace + - ./gradlew lint build connectedCheck -PdisablePreDex --stacktrace diff --git a/app/build.gradle b/app/build.gradle index 6d07873..b1db2e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,6 +30,10 @@ android { sourceSets { main.java.srcDirs += 'src/main/kotlin' } + + lintOptions { + baseline file("lint-baseline.xml") + } } ext { @@ -81,7 +85,7 @@ kapt { kotlinter { ignoreFailures = false - reporters = ['html'] + reporters = ['html', 'plain'] experimentalRules = false disabledRules = ['import-ordering'] } diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml new file mode 100644 index 0000000..ef36214 --- /dev/null +++ b/app/lint-baseline.xml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +