From 79bcfcd811e758e20d7208fa127efc21abf3df4b Mon Sep 17 00:00:00 2001 From: Sergey Boishtyan Date: Wed, 18 May 2022 23:21:27 +0300 Subject: [PATCH] Tech | Fix | Lint setup for CI (#2286) * Tech | Fix | Reduce tag size * Tech | Enhancement | Move lint configuration to one place * Tech | Enhancement | Enable Gradle quiet mode for errors logs only --- .github/workflows/check.yml | 4 ++-- .github/workflows/workflow.yml | 2 +- app/build.gradle | 7 ------- build.gradle | 2 ++ core-ui/build.gradle | 4 ---- lint.gradle | 10 ++++++++++ presentation/build.gradle | 4 ---- .../relations/add/BaseAddOptionsRelationViewModel.kt | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 lint.gradle diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9fc366ca8..83c5a7ef4 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -18,9 +18,9 @@ jobs: amplitude_secret_debug: ${{ secrets.ANYTYPE_AMPLITUDE_DEBUG_SECRET }} run: ./middleware2.sh $token_secret $user_secret $amplitude_secret $amplitude_secret_debug - name: Compile android test sources - run: ./gradlew compileDebugAndroidTestSources + run: ./gradlew compileDebugAndroidTestSources -q - name: Run unit tests - run: ./gradlew testDebugAll -Dpre-dex=false + run: ./gradlew testDebugAll -Dpre-dex=false -q - name: Android test report uses: asadmansr/android-test-report-action@v1.2.0 if: ${{ always() }} # IMPORTANT: run Android Test Report regardless diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 0edf22124..772ce85ce 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -15,4 +15,4 @@ jobs: amplitude_secret_debug: ${{ secrets.ANYTYPE_AMPLITUDE_DEBUG_SECRET }} run: ./middleware2.sh $token_secret $user_secret $amplitude_secret $amplitude_secret_debug - name: Run unit tests. Full mode. - run: ./gradlew build test -Dpre-dex=false + run: ./gradlew build test -Dpre-dex=false -q diff --git a/app/build.gradle b/app/build.gradle index 8a877188c..0b1405ff7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,13 +85,6 @@ android { kotlinCompilerExtensionVersion config.compose_version } - lint { - abortOnError false - disable 'InvalidPackage', 'OldTargetApi', 'IconDensities', 'IconMissingDensityFolder' - ignoreWarnings true - quiet true - } - buildFeatures { viewBinding true compose true diff --git a/build.gradle b/build.gradle index 07b6fff51..a2e9bc9cd 100644 --- a/build.gradle +++ b/build.gradle @@ -40,11 +40,13 @@ subprojects { testDebugAll.dependsOn(tasks.named("test")) } plugins.withId("com.android.library") { + project.apply from: "$rootDir/lint.gradle" afterEvaluate { testDebugAll.dependsOn(tasks.named("testDebugUnitTest")) } } plugins.withId("com.android.application") { + project.apply from: "$rootDir/lint.gradle" afterEvaluate { testDebugAll.dependsOn(tasks.named("testDebugUnitTest")) } diff --git a/core-ui/build.gradle b/core-ui/build.gradle index 4795ea46c..55138f449 100644 --- a/core-ui/build.gradle +++ b/core-ui/build.gradle @@ -31,10 +31,6 @@ android { composeOptions { kotlinCompilerExtensionVersion config["compose_version"] } - - lint { - abortOnError false - } buildFeatures { viewBinding true diff --git a/lint.gradle b/lint.gradle new file mode 100644 index 000000000..dc5a09a3a --- /dev/null +++ b/lint.gradle @@ -0,0 +1,10 @@ +android { + lint { + abortOnError false + disable 'InvalidPackage', 'OldTargetApi', 'IconDensities', 'IconMissingDensityFolder', 'NullSafeMutableLiveData' + ignoreWarnings true + quiet true + checkReleaseBuilds false + checkDependencies false + } +} \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle index 5862390b4..98705511b 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -14,10 +14,6 @@ android { } testOptions.unitTests.includeAndroidResources = true - - lint { - disable 'NullSafeMutableLiveData' - } } dependencies { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/BaseAddOptionsRelationViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/BaseAddOptionsRelationViewModel.kt index 4e3fde7e6..6001b9ad0 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/BaseAddOptionsRelationViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/add/BaseAddOptionsRelationViewModel.kt @@ -37,7 +37,7 @@ abstract class BaseAddOptionsRelationViewModel( val isMultiple = MutableStateFlow(true) - private val logger = Timber.tag("BaseAddOptionsRelationViewModel") + private val logger = Timber.tag("BaseAddOptionsRelation") init { viewModelScope.launch {