Merge pull request #1534 from maxrave-dev/dev

v1.0.1: New update

Author: maxrave-dev

.github/workflows/desktop-deb-package.yml

@@ -52,10 +52,10 @@ jobs:
         run: ./gradlew exportLibraryDefinitions
 
       - name: Build desktop DEB package
-        run: ./gradlew packageDeb
+        run: ./gradlew packageReleaseDeb
 
       - name: Upload DEB package
         uses: actions/upload-artifact@v4
         with:
           name: desktop-deb-package
-          path: composeApp/build/compose/binaries/main/deb/*.deb
+          path: composeApp/build/compose/binaries/main-release/deb/*.deb

.github/workflows/desktop-dmg-package.yml

@@ -52,10 +52,10 @@ jobs:
         run: ./gradlew exportLibraryDefinitions
 
       - name: Build desktop DMG package
-        run: ./gradlew packageDmg
+        run: ./gradlew packageReleaseDmg
 
       - name: Upload DMG package
         uses: actions/upload-artifact@v4
         with:
           name: desktop-dmg-package
-          path: composeApp/build/compose/binaries/main/dmg/*.dmg
+          path: composeApp/build/compose/binaries/main-release/dmg/*.dmg

.github/workflows/desktop-msi-package.yml

@@ -52,10 +52,10 @@ jobs:
         run: ./gradlew exportLibraryDefinitions
 
       - name: Build desktop MSI package
-        run: ./gradlew packageMsi
+        run: ./gradlew packageReleaseMsi
 
       - name: Upload MSI package
         uses: actions/upload-artifact@v4
         with:
           name: desktop-msi-package
-          path: composeApp/build/compose/binaries/main/msi/*.msi
+          path: composeApp/build/compose/binaries/main-release/msi/*.msi

.github/workflows/desktop-rpm-package.yml

@@ -0,0 +1,64 @@
+name: Build desktop RPM package
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'dev'
+    paths-ignore:
+      - 'README.md'
+      - 'fastlane/**'
+      - 'assets/**'
+      - '.github/**/*.md'
+      - '.github/FUNDING.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+
+permissions:
+  contents: write
+
+jobs:
+  build-desktop-rpm:
+    name: Build desktop RPM package
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          
+      - name: Install RPM build tools
+        run: sudo apt-get update && sudo apt-get install -y rpm
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: "zulu"
+          cache: 'gradle'
+
+      - name: Update build product flavor
+        run: |
+          echo "" >> ./gradle.properties
+          echo "isFullBuild=true" >> ./gradle.properties
+
+      - name: Update Sentry Secrets
+        env:
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN_JVM }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: |
+          echo 'SENTRY_DSN=${{ secrets.SENTRY_DSN_JVM }}' > ./local.properties
+          echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> ./local.properties
+
+      - name: Generate aboutLibraries.json
+        run: ./gradlew exportLibraryDefinitions
+
+      - name: Build desktop RPM package
+        run: ./gradlew packageReleaseRpm
+
+      - name: Upload RPM package
+        uses: actions/upload-artifact@v4
+        with:
+          name: desktop-rpm-package
+          path: composeApp/build/compose/binaries/main-release/rpm/*.rpm

.gitignore

@@ -27,3 +27,4 @@ sentry.properties
 /composeApp/build/
 /composeApp/cache/
 /composeApp/kcef-bundle/
+/.mcp.json

MediaServiceCore

@@ -75,7 +75,7 @@ A FOSS YouTube Music client for Android and Desktop with many features from<br>S
 - Special thanks to [SmartTube](https://github.com/yuliskov/SmartTube). This repo help me to extract the streaming URL of YouTube Music.    
 - My app is using [SponsorBlock](https://sponsor.ajay.app/) to skip sponsor in YouTube videos.    
 - ReturnYouTubeDislike for getting information on votes 
-- Main lyrics data from SimpMusic Lyrics. More information [SimpMusic Lyrics](https://lyrics.simpmusic.org/)
+- Main lyrics data from SimpMusic Lyrics
 - Alternative lyrics data from LRCLIB. More information [LRCLIB](https://lrclib.net/)    
 
  ## Privacy    

README.md

@@ -30,7 +30,7 @@ plugins {
 dependencies {
     coreLibraryDesugaring(libs.desugaring)
     val debugImplementation = "debugImplementation"
-    debugImplementation(compose.uiTooling)
+    debugImplementation(libs.ui.tooling)
 }
 
 kotlin {
@@ -69,7 +69,7 @@ kotlin {
             implementation(libs.koin.android)
             implementation(libs.koin.androidx.compose)
 
-            implementation(compose.preview)
+            implementation(libs.jetbrains.ui.tooling.preview)
             implementation(libs.activity.compose)
             implementation(libs.constraintlayout.compose)
 
@@ -107,12 +107,12 @@ kotlin {
             }
         }
         commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
-            implementation(compose.preview)
+            implementation(libs.runtime)
+            implementation(libs.foundation)
+            implementation(libs.compose.material3)
+            implementation(libs.compose.ui)
+            implementation(libs.components.resources)
+            implementation(libs.jetbrains.ui.tooling.preview)
             implementation(libs.androidx.lifecycle.viewmodelCompose)
             implementation(libs.androidx.lifecycle.runtimeCompose)
 
@@ -312,7 +312,7 @@ compose.desktop {
         mainClass = "com.maxrave.simpmusic.MainKt"
 
         nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb, TargetFormat.Rpm)
             modules("jdk.unsupported")
             packageName = "SimpMusic"
             macOS {
@@ -352,8 +352,8 @@ compose.desktop {
 
         buildTypes.release.proguard {
             optimize.set(true)
-            obfuscate.set(false)
-            configurationFiles.from("proguard-rules.pro")
+            obfuscate.set(true)
+            configurationFiles.from("proguard-desktop-rules.pro")
         }
     }
 }
@@ -429,10 +429,22 @@ sentry {
     } else {
         includeProguardMapping.set(false)
         autoUploadProguardMapping.set(false)
+        uploadNativeSymbols.set(false)
+        includeDependenciesReport.set(false)
+        includeSourceContext.set(false)
+        includeNativeSources.set(false)
     }
     telemetry.set(false)
 }
 
+if (!isFullBuild) {
+    tasks.whenTaskAdded {
+        if (name.contains("injectSentryDebugMetaPropertiesIntoAssetsRelease")) {
+            enabled = false
+        }
+    }
+}
+
 afterEvaluate {
     tasks.withType<JavaExec> {
         jvmArgs("--add-opens", "java.desktop/sun.awt=ALL-UNNAMED")
@@ -444,4 +456,4 @@ afterEvaluate {
             jvmArgs("--add-opens", "java.desktop/sun.lwawt.macosx=ALL-UNNAMED")
         }
     }
-}
+}