Merge branch 'develop' into Skrilltrax/develop

* develop:
  github: switch gradle-cache-action back to tag qualifier
  github: update actions in pull request workflow
  github: update automerge action
  gradle: silence warnings from beta options
  app: replace deprecated contentColor extension
  build: update Compose and Room

.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 }}"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          UPDATE_RETRIES: 10
+          MERGE_RETRIES: 10
-          UPDATE_RETRY_SLEEP: 60000
+          MERGE_RETRY_SLEEP: 60000

.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,7 +23,7 @@ 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' }}
@@ -36,7 +36,7 @@ jobs:
 
     - 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

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 ->

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()

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