Merge pull request #1549 from maxrave-dev/dev

v1.0.1-hf: Hot fix FOSS build

Author: maxrave-dev

composeApp/build.gradle.kts

@@ -317,7 +317,7 @@ compose.desktop {
             packageName = "SimpMusic"
             macOS {
                 includeAllModules = true
-                packageVersion = "2025.11.16"
+                packageVersion = "2025.12.24"
                 iconFile.set(project.file("icon/circle_app_icon.icns"))
                 val macExtraPlistKeys =
                     """
@@ -339,13 +339,15 @@ compose.desktop {
                 packageVersion =
                     libs.versions.version.name
                         .get()
+                        .removeSuffix("-hf")
                 iconFile.set(project.file("icon/circle_app_icon.ico"))
             }
             linux {
                 includeAllModules = true
                 packageVersion =
                     libs.versions.version.name
                         .get()
+                        .removeSuffix("-hf")
                 iconFile.set(project.file("icon/circle_app_icon.png"))
             }
         }
@@ -438,9 +440,60 @@ sentry {
 }
 
 if (!isFullBuild) {
+    abstract class CleanSentryMetaTask : DefaultTask() {
+        @get:InputFiles
+        abstract val assetDirectories: ConfigurableFileCollection
+
+        @get:Internal
+        abstract val buildDirectory: DirectoryProperty
+
+        @TaskAction
+        fun execute() {
+            assetDirectories.forEach { assetDir ->
+                val sentryFile = File(assetDir, "sentry-debug-meta.properties")
+                if (sentryFile.exists()) {
+                    sentryFile.delete()
+                    println("Deleted: ${sentryFile.absolutePath}")
+                }
+            }
+
+            val dirName = "release/mergeReleaseAssets"
+            val injectDirName = "release/injectSentryDebugMetaPropertiesIntoAssetsRelease"
+            println("Cleaning Sentry meta files in build directories")
+            println("Build directory: ${buildDirectory.asFile.get().absolutePath}")
+
+            val buildAssetsDir = File(buildDirectory.asFile.get(), "intermediates/assets/$dirName")
+            println("Checking directory buildAssetsDir: ${buildAssetsDir.absolutePath}")
+            val sentryFile = File(buildAssetsDir, "sentry-debug-meta.properties")
+            if (sentryFile.exists()) {
+                sentryFile.delete()
+                println("Deleted: ${sentryFile.absolutePath}")
+            }
+
+            val injectBuildAssetsDir = File(buildDirectory.asFile.get(), "intermediates/assets/$injectDirName")
+            println("Checking directory injectBuildAssetsDir: ${injectBuildAssetsDir.absolutePath}")
+            val injectSentryFile = File(injectBuildAssetsDir, "sentry-debug-meta.properties")
+            if (injectSentryFile.exists()) {
+                injectSentryFile.delete()
+                println("Deleted: ${injectSentryFile.absolutePath}")
+                val sentryFile = File(injectBuildAssetsDir, "sentry-debug-meta.properties")
+                sentryFile.writeText("")
+                println("✓ Overwritten: ${sentryFile.absolutePath}")
+            }
+        }
+    }
+
     tasks.whenTaskAdded {
         if (name.contains("injectSentryDebugMetaPropertiesIntoAssetsRelease")) {
-            enabled = false
+            val cleanSentryMetaTaskName = "cleanSentryMetaForRelease"
+            val cleanSentryMetaTask =
+                tasks.register<CleanSentryMetaTask>(cleanSentryMetaTaskName) {
+                    assetDirectories.from(android.sourceSets.flatMap { it.assets.srcDirs })
+                    buildDirectory.set(layout.buildDirectory)
+                }
+            tasks.named(name).configure {
+                finalizedBy(cleanSentryMetaTask)
+            }
         }
     }
 }
@@ -456,4 +509,4 @@ afterEvaluate {
             jvmArgs("--add-opens", "java.desktop/sun.lwawt.macosx=ALL-UNNAMED")
         }
     }
-}
+}

composeApp/proguard-rules.pro

@@ -212,4 +212,10 @@
 -keep class org.simpmusic.lyrics.models.** { *; }
 -keep class com.simpmusic.lyrics.parser.** { *; }
 
--keep class * extends androidx.room.RoomDatabase { <init>(); }
+-keep class * extends androidx.room.RoomDatabase { <init>(); }
+
+-dontwarn io.sentry.android.core.SentryLogcatAdapter
+-dontwarn io.sentry.instrumentation.file.SentryFileInputStream$Factory
+-dontwarn io.sentry.instrumentation.file.SentryFileOutputStream$Factory
+-dontwarn io.sentry.okhttp.SentryOkHttpEventListener
+-dontwarn io.sentry.okhttp.SentryOkHttpInterceptor

fastlane/metadata/android/en-US/changelogs/43.txt

@@ -0,0 +1 @@
+- Hot fix for foss build

fastlane/metadata/android/vi-VN/changelogs/43.txt

@@ -0,0 +1 @@
+- Sửa lỗi nhanh cho bản xây dựng foss

gradle/libs.versions.toml

@@ -1,10 +1,7 @@
 [versions]
 # App version
-componentsResources="1.10.0-rc02"
-foundation="1.10.0-rc02"
-runtime="1.10.0-rc02"
-version-name="1.0.1"
-version-code="42"
+version-name="1.0.1-hf"
+version-code="43"
 
 android = "8.13.1"
 kotlin = "2.2.21"
@@ -73,6 +70,9 @@ material3-multiplatform = "1.10.0-alpha05"
 adaptive = "1.2.0"
 material-multiplatform = "1.9.3"
 material-icons-multiplatform = "1.7.3"
+componentsResources="1.10.0-rc02"
+foundation="1.10.0-rc02"
+runtime="1.10.0-rc02"
 compottie = "2.0.2"
 cmptoast = "1.0.71"
 uri = "0.0.21"