From 99e351ac5d3de4e76bbd3cf2bada09b0a3a10ae7 Mon Sep 17 00:00:00 2001 From: Sk Niyaj Ali Date: Sun, 25 Aug 2024 23:41:50 +0530 Subject: [PATCH] Fix - [:mifospay] Updated splash screen icon Updated the splash screen icon to use the correct drawable and adjusted the size of the icon in the drawable . Also, disabled the `ResourceName` lint rule until the libraries are shipped to Maven. Finally, updated the CI workflow to include the dependency guard job in the build job's needs. --- .github/workflows/master_dev_ci.yml | 4 +--- .../convention/src/main/kotlin/AndroidLintConventionPlugin.kt | 2 ++ mifospay/src/main/res/drawable/bg_splash_12.xml | 4 ++-- mifospay/src/main/res/values/splash.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/master_dev_ci.yml b/.github/workflows/master_dev_ci.yml index d9ea2025a..27bb7a38d 100644 --- a/.github/workflows/master_dev_ci.yml +++ b/.github/workflows/master_dev_ci.yml @@ -79,7 +79,6 @@ jobs: - name: Prevent updating Dependency Guard baselines if this is a fork id: checkfork_dependencyguard - continue-on-error: true if: steps.dependencyguard_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository run: | echo "::error::Dependency Guard failed, please update baselines with: ./gradlew dependencyGuardBaseline" && exit 1 @@ -99,7 +98,6 @@ jobs: disable_globbing: true commit_message: "🤖 Updates baselines for Dependency Guard" - tests_and_lint: needs: setup runs-on: ubuntu-latest @@ -122,7 +120,7 @@ jobs: **/build/test-results/test*UnitTest/**.xml build: - needs: [ checks, tests_and_lint ] + needs: [ checks, dependency_guard, tests_and_lint ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt index 88a553e53..4614a16ab 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt @@ -29,6 +29,8 @@ private fun Lint.configure() { xmlReport = true checkDependencies = true abortOnError = false + // Disable this rule until we ship the libraries to some maven. + disable += "ResourceName" baseline = File("lint-baseline.xml") explainIssues = true htmlReport = true diff --git a/mifospay/src/main/res/drawable/bg_splash_12.xml b/mifospay/src/main/res/drawable/bg_splash_12.xml index 33f69ca50..a24f0fefd 100644 --- a/mifospay/src/main/res/drawable/bg_splash_12.xml +++ b/mifospay/src/main/res/drawable/bg_splash_12.xml @@ -14,8 +14,8 @@ \ No newline at end of file diff --git a/mifospay/src/main/res/values/splash.xml b/mifospay/src/main/res/values/splash.xml index 6ba18b7c0..c3208953d 100644 --- a/mifospay/src/main/res/values/splash.xml +++ b/mifospay/src/main/res/values/splash.xml @@ -11,7 +11,7 @@