From b5a581d55cfe9ac954dea99a5ef20f39c4825776 Mon Sep 17 00:00:00 2001 From: Corentin Garcia Date: Sun, 30 Oct 2022 17:08:36 +0100 Subject: [PATCH 1/2] fix: fix tramway icons tests --- .../main/java/fr/corenting/traficparis/utils/DrawableUtils.kt | 2 +- .../res/drawable-anydpi/{tramway_3a.xml => tramway_t3a.xml} | 0 .../java/fr/corenting/traficparis/utils/DrawableUtilsTest.kt | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename app/src/main/res/drawable-anydpi/{tramway_3a.xml => tramway_t3a.xml} (100%) diff --git a/app/src/main/java/fr/corenting/traficparis/utils/DrawableUtils.kt b/app/src/main/java/fr/corenting/traficparis/utils/DrawableUtils.kt index bc0aaee..ca7036f 100644 --- a/app/src/main/java/fr/corenting/traficparis/utils/DrawableUtils.kt +++ b/app/src/main/java/fr/corenting/traficparis/utils/DrawableUtils.kt @@ -26,7 +26,7 @@ object DrawableUtils { return ContextCompat.getDrawable( context, - getLineDrawable(context, name) + identifier ) } diff --git a/app/src/main/res/drawable-anydpi/tramway_3a.xml b/app/src/main/res/drawable-anydpi/tramway_t3a.xml similarity index 100% rename from app/src/main/res/drawable-anydpi/tramway_3a.xml rename to app/src/main/res/drawable-anydpi/tramway_t3a.xml diff --git a/app/src/test/java/fr/corenting/traficparis/utils/DrawableUtilsTest.kt b/app/src/test/java/fr/corenting/traficparis/utils/DrawableUtilsTest.kt index 3629bdd..2f1d455 100644 --- a/app/src/test/java/fr/corenting/traficparis/utils/DrawableUtilsTest.kt +++ b/app/src/test/java/fr/corenting/traficparis/utils/DrawableUtilsTest.kt @@ -37,7 +37,7 @@ class DrawableUtilsTest { @Test fun getDrawableForTramway() { - for (i in listOf("1", "2", "3a", "3b", "4", "5", "6", "7", "8", "11")) { + for (i in listOf("T1", "T2", "T3a", "T3b", "T4", "T5", "T6", "T7", "T8", "T11")) { val ret = DrawableUtils.getDrawableForLine(this.context, LineType.TRAMWAY, i) assertNotNull(ret) From 55682329ac2d19248bb18558ae854887b2a6455e Mon Sep 17 00:00:00 2001 From: Corentin Garcia Date: Sun, 30 Oct 2022 17:12:28 +0100 Subject: [PATCH 2/2] chore(ci): update github actions --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed3ff1c..ee8cc52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,11 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/checkout@v3 + - name: Setup JDK + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle - name: Grant execute permission for gradlew @@ -26,7 +26,7 @@ jobs: - name: Test run: ./gradlew testDebugUnitTest - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: app-debug.apk path: app/build/outputs/apk/debug/app-debug.apk