Merge pull request #236 from metabrainz/dev

Dev to Main
metabrainz · Jul 15, 2024 · a931b37 · a931b37
2 parents 6f8e81c + 9d452dc
commit a931b37
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
           java-version: 17

diff --git a/.github/workflows/attach-release.yml b/.github/workflows/attach-release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: checkout code
         uses: actions/checkout@v4
       - name: setup jdk
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
           java-version: 17
@@ -37,7 +37,7 @@ jobs:
           KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle.properties') }}
@@ -48,7 +48,7 @@ jobs:
 
       - name: Find release tag name
         id: find_release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const { owner, repo } = context.repo;
@@ -57,7 +57,7 @@ jobs:
             return { tag_name: latestRelease.tag_name };
             
       - name: Attach APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ListenBrainz
           path: app/build/outputs/apk/release/app-release.apk

diff --git a/.github/workflows/releaseBeta.yml b/.github/workflows/releaseBeta.yml
@@ -8,9 +8,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'adopt'
@@ -21,20 +21,20 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Cache Ruby - Bundler
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-gems-
       - name: Cache Gradle
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches/
           key: cache-clean-gradle-${{ matrix.os }}-${{ matrix.jdk }}
 
       - name: Cache Gradle Wrapper
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/wrapper/
           key: cache-clean-wrapper-${{ matrix.os }}-${{ matrix.jdk }}

diff --git a/.github/workflows/releaseProd.yml b/.github/workflows/releaseProd.yml
@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'adopt'
@@ -23,20 +23,20 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Cache Ruby - Bundler
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-gems-
       - name: Cache Gradle
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches/
           key: cache-clean-gradle-${{ matrix.os }}-${{ matrix.jdk }}
 
       - name: Cache Gradle Wrapper
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/wrapper/
           key: cache-clean-wrapper-${{ matrix.os }}-${{ matrix.jdk }}

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,15 +3,15 @@ kotlin = "2.0.0"
 navigation = "2.7.7"
 hilt = "2.51.1"
 compose = "1.6.8"
-androidGradlePlugin = "8.5.0"
+androidGradlePlugin = "8.5.1"
 appcompat = "1.7.0"
 lifecycle = "2.8.3"
 browser = "1.8.0"
 recyclerview = "1.3.2"
 constraintlayout = "2.1.4"
 preference = "1.2.1"
 core-splashscreen = "1.0.1"
-ksp = "2.0.0-1.0.22"
+ksp = "2.0.0-1.0.23"
 gson = "2.11.0"
 retrofit = "2.11.0"
 okhttp = "5.0.0-alpha.14"