Skip to content

Commit

Permalink
Merge branch 'main' into xr
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle/libs.versions.toml
  • Loading branch information
fobo66 committed Feb 8, 2025
2 parents b4c0d6a + a3885a2 commit a62b969
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
java-version: '23'
distribution: 'temurin'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4.2.2
uses: gradle/actions/setup-gradle@v4.3.0
with:
validate-wrappers: true
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
Expand All @@ -49,7 +49,7 @@ jobs:
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
- name: Gradle cache
uses: gradle/actions/setup-gradle@v4.2.2
uses: gradle/actions/setup-gradle@v4.3.0
with:
validate-wrappers: true
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
accompanist = "0.37.0"
androidGradlePlugin = "8.10.0-alpha03"
androidGradlePlugin = "8.10.0-alpha04"
androidxActivity = "1.10.0"
androidxAnnotations = "1.9.1"
androidxBenchmark = "1.3.3"
Expand Down

0 comments on commit a62b969

Please sign in to comment.