deps: update dependencies

2026-04-15 15:41:10 +08:00
parent b752ca4799
commit 6ae425681a
8 changed files with 58 additions and 27 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
    alias(libs.plugins.android.application)
    alias(libs.plugins.compose.compiler)
@@ -18,16 +20,28 @@ android {

    signingConfigs {
        create("release") {
-            val releaseStoreFile = System.getenv("RELEASE_STORE_FILE")
-            val releaseStorePassword = System.getenv("RELEASE_STORE_PASSWORD")
-            val releaseKeyAlias = System.getenv("RELEASE_KEY_ALIAS")
-            val releaseKeyPassword = System.getenv("RELEASE_KEY_PASSWORD")
+            val envFile = rootProject.file(".env")
+            val envProps = Properties()
+            if (envFile.exists())
+                envFile.inputStream().use { envProps.load(it) }

+            fun getValue(key: String): String? {
+                var value = (
+                        envProps.getProperty(key)?.trim()?.takeIf { it.isNotEmpty() }
+                            ?: System.getenv(key)?.trim()?.takeIf { it.isNotEmpty() }
+                        )
+                    ?.trim('"', '\'')
+                if (value != null && value.startsWith("~"))
+                    value = System.getProperty("user.home") + value.substring(1)
+                return value
+            }
+
+            val releaseStoreFile = getValue("RELEASE_STORE_FILE")
            if (!releaseStoreFile.isNullOrBlank()) {
                storeFile = file(releaseStoreFile)
-                storePassword = releaseStorePassword
-                keyAlias = releaseKeyAlias
-                keyPassword = releaseKeyPassword
+                storePassword = getValue("RELEASE_STORE_PASSWORD")
+                keyAlias = getValue("RELEASE_KEY_ALIAS")
+                keyPassword = getValue("RELEASE_KEY_PASSWORD")
                enableV1Signing = true
                enableV2Signing = true
                enableV3Signing = true
@@ -39,7 +53,7 @@ android {
    defaultConfig {
        applicationId = "io.github.miuzarte.scrcpyforandroid"
        minSdk = 26
-        targetSdk = 36
+        targetSdk = 37
        versionCode = 13
        versionName = "0.1.7"

@@ -93,8 +107,8 @@ android {
        }
    }

-    buildToolsVersion = "36.0.0"
-    ndkVersion = "28.2.13676358"
+    buildToolsVersion = "37.0.0"
+    ndkVersion = "29.0.14206865"
 }

 dependencies {
@@ -115,12 +129,12 @@ dependencies {
    implementation(libs.miuix.icons)
    implementation(libs.miuix.navigation3.ui)
    implementation(libs.backdrop)
-    implementation("io.github.vvb2060.ndk:boringssl:20250114")
-    implementation("org.lsposed.libcxx:libcxx:27.0.12077973")
-    implementation("org.bouncycastle:bcpkix-jdk18on:1.80")
-    implementation("org.conscrypt:conscrypt-android:2.5.2")
-    implementation("sh.calvin.reorderable:reorderable:3.0.0")
-    implementation("androidx.datastore:datastore-preferences:1.2.1")
+    implementation(libs.boringssl)
+    implementation(libs.libcxx)
+    implementation(libs.bcpkix.jdk18on)
+    implementation(libs.conscrypt.android)
+    implementation(libs.reorderable)
+    implementation(libs.androidx.datastore.preferences)
    implementation(libs.androidx.compose.runtime)
    implementation(libs.androidx.biometric)
    implementation(libs.androidx.security.crypto)
--- a/app/src/androidTest/java/io/github/miuzarte/scrcpyforandroid/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/io/github/miuzarte/scrcpyforandroid/ExampleInstrumentedTest.kt
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
    fun useAppContext() {
        // Context of the app under test.
        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("io.github.miuzarte.scrcpyforandroid", appContext.packageName)
+        assertEquals(BuildConfig.APPLICATION_ID, appContext.packageName)
    }
 }
--- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/nativecore/AdbMdnsDiscoverer.kt
+++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/nativecore/AdbMdnsDiscoverer.kt
@@ -1,5 +1,6 @@
 package io.github.miuzarte.scrcpyforandroid.nativecore

+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.nsd.NsdManager
 import android.net.nsd.NsdServiceInfo
@@ -72,6 +73,8 @@ internal object AdbMdnsDiscoverer {
                Log.w(TAG, "stop discovery failed: $serviceType, error=$errorCode")
            }

+            @Suppress("DEPRECATION")
+            @SuppressLint("NewApi")
            override fun onServiceFound(serviceInfo: NsdServiceInfo) {
                if (discoveryFinished.get()) return
                Log.v(TAG, "service found: ${serviceInfo.serviceName}")
@@ -82,7 +85,7 @@ internal object AdbMdnsDiscoverer {

                    override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
                        if (discoveryFinished.get()) return
-                        val hostAddress = serviceInfo.host?.hostAddress ?: return
+                        val hostAddress = serviceInfo.hostAddresses[0].hostAddress ?: return
                        if (hostAddress.isBlank()) return

                        if (!includeLanDevices) {
--- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/AboutScreen.kt
+++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/AboutScreen.kt
@@ -73,6 +73,7 @@ import top.yukonga.miuix.kmp.preference.ArrowPreference
 import top.yukonga.miuix.kmp.shapes.SmoothRoundedCornerShape
 import top.yukonga.miuix.kmp.theme.MiuixTheme.colorScheme
 import top.yukonga.miuix.kmp.theme.MiuixTheme.textStyles
+import java.util.Locale.getDefault

@Composable
 internal fun AboutScreen() {
@@ -269,7 +270,8 @@ private fun AboutContent(
                )
            }
            Text(
-                text = "v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})",
+                text = "v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})" +
+                        " · ${BuildConfig.BUILD_TYPE.uppercase(getDefault())} BUILD",
                modifier = Modifier
                    .fillMaxWidth()
                    .graphicsLayer {
--- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/password/PasswordRepository.kt
+++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/password/PasswordRepository.kt
@@ -13,6 +13,7 @@ import java.security.GeneralSecurityException
 import java.security.KeyStoreException
 import java.util.UUID

+@Suppress("DEPRECATION")
 object PasswordRepository {
    private const val PREFS_NAME = "LockscreenPasswords"
    private const val KEY_ORDER = "__order"
--- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/services/PictureInPictureActionReceiver.kt
+++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/services/PictureInPictureActionReceiver.kt
@@ -5,6 +5,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import io.github.miuzarte.scrcpyforandroid.BuildConfig
 import kotlinx.coroutines.runBlocking

 // not working in MIUI
@@ -28,7 +29,7 @@ class PictureInPictureActionReceiver : BroadcastReceiver() {

    companion object {
        const val ACTION_STOP_SCRCPY =
-            "io.github.miuzarte.scrcpyforandroid.action.STOP_SCRCPY_FROM_PIP"
+            "${BuildConfig.APPLICATION_ID}.action.STOP_SCRCPY_FROM_PIP"
        private const val REQUEST_CODE_STOP_SCRCPY = 1

        fun createIntentFilter(): IntentFilter = IntentFilter(ACTION_STOP_SCRCPY)