diff --git a/apache/commons-lang b/apache/commons-lang index 07d2393c..47119989 160000 --- a/apache/commons-lang +++ b/apache/commons-lang @@ -1 +1 @@ -Subproject commit 07d2393cea701c5ac25cdc00c26c4f7530d42437 +Subproject commit 4711998927a52abe70bec7075f9f89e02824b404 diff --git a/external/fmt b/external/fmt index e814b5fa..20c8fdad 160000 --- a/external/fmt +++ b/external/fmt @@ -1 +1 @@ -Subproject commit e814b5fabf2cbd61aeca6fdb99e99961f23fcdb7 +Subproject commit 20c8fdad0605a1627a3f6d15cad693a3fbe2ecbf diff --git a/external/lsplant b/external/lsplant index 3d52ee31..4e9ad800 160000 --- a/external/lsplant +++ b/external/lsplant @@ -1 +1 @@ -Subproject commit 3d52ee31e450a027920fd0242d9748b39e6fb05f +Subproject commit 4e9ad800eba97550a38a1b4f9d06e4c3386aaf1c diff --git a/external/lsplt b/external/lsplt index 9c08b13c..207581f3 160000 --- a/external/lsplt +++ b/external/lsplt @@ -1 +1 @@ -Subproject commit 9c08b13ca9cfed69649f70715a3af7063e57ce59 +Subproject commit 207581f35e8174661c67aa2d434156968c0bd327 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7900bb46..7fe7ff8f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] -agp = "8.9.1" -kotlin = "2.1.20" -nav = "2.8.9" +agp = "8.11.1" +kotlin = "2.2.0" +nav = "2.9.1" appcenter = "5.0.5" libxposed = "100" glide = "4.16.0" -okhttp = "4.12.0" +okhttp = "5.1.0" [plugins] agp-lib = { id = "com.android.library", version.ref = "agp" } @@ -36,7 +36,7 @@ androidx-annotation = { module = "androidx.annotation:annotation", version = "1. androidx-browser = { module = "androidx.browser:browser", version = "1.8.0" } androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" } androidx-core = { module = "androidx.core:core", version = "1.16.0" } -androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.6" } +androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.8" } androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "nav" } androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "nav" } androidx-preference = { module = "androidx.preference:preference", version = "1.2.1" } @@ -53,7 +53,7 @@ okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-i agp-apksig = { group = "com.android.tools.build", name = "apksig", version.ref = "agp" } appiconloader = { module = "me.zhanghai.android.appiconloader:appiconloader", version = "1.5.0" } material = { module = "com.google.android.material:material", version = "1.12.0" } -gson = { module = "com.google.code.gson:gson", version = "2.13.0" } +gson = { module = "com.google.code.gson:gson", version = "2.13.1" } hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version = "6.1" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.10.2" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..1b33c55b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..d4081da4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b..23d15a93 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_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. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..db3a6ac2 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts index 82f6ba87..79f588b4 100644 --- a/magisk-loader/build.gradle.kts +++ b/magisk-loader/build.gradle.kts @@ -143,7 +143,7 @@ val generateWebRoot = tasks.register("generateWebRoot") { doLast { exec { workingDir = webroottmp - commandLine("pnpm", "add", "-D", "parcel-bundler", "kernelsu") + commandLine("pnpm", "add", "-D", "parcel", "kernelsu") } exec { workingDir = webroottmp diff --git a/magisk-loader/src/webroot/index.html b/magisk-loader/src/webroot/index.html index 7ceefe5a..639356da 100644 --- a/magisk-loader/src/webroot/index.html +++ b/magisk-loader/src/webroot/index.html @@ -3,7 +3,7 @@ JingMatrix/LSPosed - +