From 53643c9c5aeaa94ac559a161654c56fd3d8c361b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:03:52 +0530 Subject: [PATCH 1/6] build: update Compose and Room Signed-off-by: Harsh Shandilya --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e776bfde..9eda9d31 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { agp_version = "4.2.0-alpha13" appcompat_version = "1.3.0-alpha02" browser_version = "1.3.0-alpha06" - compose_version = "1.0.0-alpha04" + compose_version = "1.0.0-alpha05" core_version = "1.5.0-alpha04" coroutines_version = "1.3.9" customtabs_version = "3.0.2" @@ -21,7 +21,7 @@ buildscript { moshi_version = "1.9.3" okhttp_version = "3.14.9" retrofit_version = "2.9.0" - room_version = "2.3.0-alpha02" + room_version = "2.3.0-alpha03" } repositories { google() From d8435602d3f48af9bfb06457169bf90dff32860d Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:12:46 +0530 Subject: [PATCH 2/6] app: replace deprecated contentColor extension Signed-off-by: Harsh Shandilya --- .../java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt b/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt index 73c0f126..c9301983 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/compose/utils/DeferredIcon.kt @@ -17,7 +17,7 @@ package dev.msfjarvis.lobsters.compose.utils import androidx.annotation.DrawableRes import androidx.compose.foundation.Icon -import androidx.compose.foundation.contentColor +import androidx.compose.foundation.AmbientContentColor import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -28,7 +28,7 @@ import androidx.compose.ui.res.loadVectorResource fun IconResource( @DrawableRes resourceId: Int, modifier: Modifier = Modifier, - tint: Color = contentColor() + tint: Color = AmbientContentColor.current ) { val deferredResource = loadVectorResource(resourceId) deferredResource.onLoadRun { asset -> From db26f4dbd990b7f62f232e436e8e80363fbaccc6 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:13:37 +0530 Subject: [PATCH 3/6] gradle: silence warnings from beta options Signed-off-by: Harsh Shandilya --- gradle.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gradle.properties b/gradle.properties index 60903229..bc6a197f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,3 +44,6 @@ android.defaults.buildfeatures.aidl=false android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false + +# Disable warnings about unsupported features, we know what we're doing +android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings From 978d373893eb8f354f4467d785686987b0218925 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:22:38 +0530 Subject: [PATCH 4/6] github: update automerge action Signed-off-by: Harsh Shandilya --- .github/workflows/automerge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 0263b366..ff66b7bb 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -22,8 +22,8 @@ jobs: runs-on: ubuntu-latest steps: - name: automerge - uses: "pascalgn/automerge-action@v0.11.0" + uses: pascalgn/automerge-action@88480459fd3771b8f4c7e68bb9b677b5e1e48f36 env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - UPDATE_RETRIES: 10 - UPDATE_RETRY_SLEEP: 60000 + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MERGE_RETRIES: 10 + MERGE_RETRY_SLEEP: 60000 From f3107ed19afe647146002a8772c853476e1be8c3 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:24:54 +0530 Subject: [PATCH 5/6] github: update actions in pull request workflow Signed-off-by: Harsh Shandilya --- .github/workflows/pull_request.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 06628731..e1643211 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check if relevant files have changed - uses: actions/github-script@0.9.0 + uses: actions/github-script@28e5ebafd79744f2a15dd15e742233b068e0f762 id: service-changed with: result-encoding: string @@ -23,20 +23,20 @@ jobs: - name: Checkout repository if: ${{ steps.service-changed.outputs.result == 'true' }} - uses: actions/checkout@v2 + uses: actions/checkout@c952173edf28a2bd22e1a4926590c1ac39630461 - name: Copy CI gradle.properties if: ${{ steps.service-changed.outputs.result == 'true' }} run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - uses: burrunan/gradle-cache-action@v1 + - uses: burrunan/gradle-cache-action@61348edb3ed90fd775bd9738ac6535163f5b8c4b name: Run unit tests with: arguments: testDebug - name: (Fail-only) upload test report if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@27bce4eee761b5bc643f46a8dfb41b430c8d05f6 with: name: Test report path: app/build/reports From 646ab03660118b18d815b3ea6fba878a60cf6130 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:28:58 +0530 Subject: [PATCH 6/6] github: switch gradle-cache-action back to tag qualifier Signed-off-by: Harsh Shandilya --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e1643211..2ff153f8 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -29,7 +29,7 @@ jobs: if: ${{ steps.service-changed.outputs.result == 'true' }} run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - uses: burrunan/gradle-cache-action@61348edb3ed90fd775bd9738ac6535163f5b8c4b + - uses: burrunan/gradle-cache-action@v1 name: Run unit tests with: arguments: testDebug