diff --git a/android/build.gradle b/android/build.gradle index 6ea5951..3270ddc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,8 +7,8 @@ buildscript { compileSdkVersion = 35 targetSdkVersion = 29 - ndkVersion = "25.1.8937393" - kotlinVersion = "1.8.10" // Or any version above 1.3.x + ndkVersion = "26.1.10909125" + kotlinVersion = "1.9.24" // Or any version above 1.3.x RNNKotlinVersion = kotlinVersion } repositories { @@ -16,7 +16,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle") + classpath('com.android.tools.build:gradle:8.6.1') classpath("com.facebook.react:react-native-gradle-plugin") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index 7f93135..e644113 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index d11cdd9..6f7a6eb 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/gradlew b/android/gradlew index 0adc8e1..b740cf1 100755 --- a/android/gradlew +++ b/android/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/android/gradlew.bat b/android/gradlew.bat index 93e3f59..25da30d 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/package-lock.json b/package-lock.json index a22b5a5..4bc256b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "lx-music-mobile", - "version": "1.7.0-beta.4", + "version": "1.7.0-beta.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "lx-music-mobile", - "version": "1.7.0-beta.4", + "version": "1.7.0-beta.5", "license": "Apache-2.0", "dependencies": { "@craftzdog/react-native-buffer": "^6.0.5", @@ -24,12 +24,12 @@ "react-native-fast-image": "^8.6.3", "react-native-file-system": "github:lyswhut/react-native-file-system#2a37b90dbb8d37c5180777d0bf0d4f160812b0c1", "react-native-fs": "^2.20.0", - "react-native-local-media-metadata": "github:lyswhut/react-native-local-media-metadata#5e55e67ecd1d557f29453e1cf34ff087efabbc7b", + "react-native-local-media-metadata": "github:lyswhut/react-native-local-media-metadata#5eac1b6c70e934a1ad7b800b3ab7122f1075f704", "react-native-navigation": "7.39.2", "react-native-pager-view": "6.3.0", "react-native-quick-base64": "^2.1.2", "react-native-quick-md5": "^3.0.6", - "react-native-track-player": "github:lyswhut/react-native-track-player#01873f81e30de85ab96363ad7351cf4bdcd39e37", + "react-native-track-player": "github:lyswhut/react-native-track-player#57eeeba57e28702fa931d4aeb753da225b6fcf6c", "react-native-vector-icons": "^10.2.0" }, "devDependencies": { @@ -10678,8 +10678,8 @@ }, "node_modules/react-native-local-media-metadata": { "version": "0.1.0", - "resolved": "git+ssh://git@github.com/lyswhut/react-native-local-media-metadata.git#5e55e67ecd1d557f29453e1cf34ff087efabbc7b", - "integrity": "sha512-lYdY4/HPpYyaL3sL8vUHGog8e6Cmp8kpQfSw2d5MlNrA1uMTA1E/p0xSGKneRuA08VRKND/SdVQ0yslpqTmzfg==", + "resolved": "git+ssh://git@github.com/lyswhut/react-native-local-media-metadata.git#5eac1b6c70e934a1ad7b800b3ab7122f1075f704", + "integrity": "sha512-UgUzALEtJ7LIYc+T1RZdQWQhttMvn0D4Bpk9ECh1B0ZuQjpqYP362ixCqnzzRwYcSd7IpTCRXkMMb16HHY7aBw==", "license": "MIT", "workspaces": [ "example" @@ -10873,8 +10873,8 @@ }, "node_modules/react-native-track-player": { "version": "2.1.2", - "resolved": "git+ssh://git@github.com/lyswhut/react-native-track-player.git#01873f81e30de85ab96363ad7351cf4bdcd39e37", - "integrity": "sha512-bJJiUPEXkSJ9mVkitfgTh7/7jONRZorktn1rpGpHTZzqaL4qKpiCgUy0y1w0uhMZvubmASlgujAHu6lxl2ZGaA==", + "resolved": "git+ssh://git@github.com/lyswhut/react-native-track-player.git#57eeeba57e28702fa931d4aeb753da225b6fcf6c", + "integrity": "sha512-Wus/F+WhqzRh7ppcOdnWV2/qvj5YIfNzIEK7ZBv9Y5leeWJ0ych7zuAJdXE7eyAfTdj2jMeFa9Z9H+qE8K9Kag==", "license": "Apache-2.0", "peerDependencies": { "react": ">=16.8.6", @@ -21333,9 +21333,9 @@ } }, "react-native-local-media-metadata": { - "version": "git+ssh://git@github.com/lyswhut/react-native-local-media-metadata.git#5e55e67ecd1d557f29453e1cf34ff087efabbc7b", - "integrity": "sha512-lYdY4/HPpYyaL3sL8vUHGog8e6Cmp8kpQfSw2d5MlNrA1uMTA1E/p0xSGKneRuA08VRKND/SdVQ0yslpqTmzfg==", - "from": "react-native-local-media-metadata@github:lyswhut/react-native-local-media-metadata#5e55e67ecd1d557f29453e1cf34ff087efabbc7b", + "version": "git+ssh://git@github.com/lyswhut/react-native-local-media-metadata.git#5eac1b6c70e934a1ad7b800b3ab7122f1075f704", + "integrity": "sha512-UgUzALEtJ7LIYc+T1RZdQWQhttMvn0D4Bpk9ECh1B0ZuQjpqYP362ixCqnzzRwYcSd7IpTCRXkMMb16HHY7aBw==", + "from": "react-native-local-media-metadata@github:lyswhut/react-native-local-media-metadata#5eac1b6c70e934a1ad7b800b3ab7122f1075f704", "requires": {} }, "react-native-macos": { @@ -21483,9 +21483,9 @@ } }, "react-native-track-player": { - "version": "git+ssh://git@github.com/lyswhut/react-native-track-player.git#01873f81e30de85ab96363ad7351cf4bdcd39e37", - "integrity": "sha512-bJJiUPEXkSJ9mVkitfgTh7/7jONRZorktn1rpGpHTZzqaL4qKpiCgUy0y1w0uhMZvubmASlgujAHu6lxl2ZGaA==", - "from": "react-native-track-player@github:lyswhut/react-native-track-player#01873f81e30de85ab96363ad7351cf4bdcd39e37", + "version": "git+ssh://git@github.com/lyswhut/react-native-track-player.git#57eeeba57e28702fa931d4aeb753da225b6fcf6c", + "integrity": "sha512-Wus/F+WhqzRh7ppcOdnWV2/qvj5YIfNzIEK7ZBv9Y5leeWJ0ych7zuAJdXE7eyAfTdj2jMeFa9Z9H+qE8K9Kag==", + "from": "react-native-track-player@github:lyswhut/react-native-track-player#57eeeba57e28702fa931d4aeb753da225b6fcf6c", "requires": {} }, "react-native-vector-icons": { diff --git a/package.json b/package.json index 445e39b..73873e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-mobile", - "version": "1.7.0-beta.4", + "version": "1.7.0-beta.5", "versionCode": 69, "private": true, "scripts": { @@ -59,12 +59,12 @@ "react-native-fast-image": "^8.6.3", "react-native-file-system": "github:lyswhut/react-native-file-system#2a37b90dbb8d37c5180777d0bf0d4f160812b0c1", "react-native-fs": "^2.20.0", - "react-native-local-media-metadata": "github:lyswhut/react-native-local-media-metadata#5e55e67ecd1d557f29453e1cf34ff087efabbc7b", + "react-native-local-media-metadata": "github:lyswhut/react-native-local-media-metadata#5eac1b6c70e934a1ad7b800b3ab7122f1075f704", "react-native-navigation": "7.39.2", "react-native-pager-view": "6.3.0", "react-native-quick-base64": "^2.1.2", "react-native-quick-md5": "^3.0.6", - "react-native-track-player": "github:lyswhut/react-native-track-player#01873f81e30de85ab96363ad7351cf4bdcd39e37", + "react-native-track-player": "github:lyswhut/react-native-track-player#57eeeba57e28702fa931d4aeb753da225b6fcf6c", "react-native-vector-icons": "^10.2.0" }, "devDependencies": {