[release] 🔧 fixes #223

* 🔧 fix synced lyrics and move to jdk 21
* 👷 Bump JDK to 21 in CI workflows

Author: shub39

.github/workflows/beta.yml

@@ -19,11 +19,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
 
       - name: Cook KeyStore

.github/workflows/release.yml

@@ -22,11 +22,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
 
       - name: Extract Version Name from Gradle

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.5.2
+- Fixed synced lyrics not loading
+- Moved to jdk 21 (fdroid builds)
+
 ## 5.5.1
 - Fixed text wrap on larger DPI (#220)
 - Added default font option (#212)

app/build.gradle.kts

@@ -10,8 +10,8 @@ plugins {
 }
 
 val appName = "Rush"
-val appVersionName = "5.5.1"
-val appVersionCode = 5510
+val appVersionName = "5.5.2"
+val appVersionCode = 5520
 
 val publicGeniusApiToken = "\"qLSDtgIqHgzGNjOFUmdOxJKGJOg5RIAPzOKTfrs7rNxqYXwfdSh9HTHMJUs2X27Y\""
 
@@ -40,12 +40,6 @@ android {
         }
     }
 
-    kotlin {
-        compilerOptions {
-            jvmToolchain(17)
-        }
-    }
-
     buildTypes {
         release {
             resValue("string", "app_name", appName)
@@ -109,9 +103,10 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

app/src/main/java/com/shub39/rush/data/network/LrcLibApi.kt

@@ -17,20 +17,18 @@ class LrcLibApi(
         trackName: String,
         artistName: String
     ): LrcGetDto? {
-        val result = searchLrcLyrics(
-            trackName = trackName,
-            artistName = artistName
-        )
+        val result = safeCall<LrcGetDto> {
+            client.get(
+                urlString = "$LRC_BASE_URL/api/get"
+            ) {
+                parameter("track_name", trackName)
+                parameter("artist_name", artistName)
+            }
+        }
 
         return when (result) {
+            is Result.Success -> result.data
             is Result.Error -> null
-            is Result.Success -> {
-                if (result.data.any { it.syncedLyrics != null }) {
-                    result.data.first { it.syncedLyrics != null }
-                } else {
-                    result.data.firstOrNull()
-                }
-            }
         }
     }
 

visualizer-helper/build.gradle.kts

@@ -28,13 +28,8 @@ android {
         compose = true
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlin {
-        compilerOptions {
-            jvmToolchain(17)
-        }
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }