Update other dependencies

Author: Mygod

build.gradle.kts

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id("com.github.ben-manes.versions") version "0.39.0"
+    id("com.github.ben-manes.versions") version "0.44.0"
 }
 
 buildscript {
@@ -20,8 +20,8 @@ buildscript {
         classpath("com.google.android.gms:oss-licenses-plugin:0.10.6")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
         classpath("com.google.gms:google-services:4.3.14")
-        classpath("com.vanniktech:gradle-maven-publish-plugin:0.21.0")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10")
+        classpath("com.vanniktech:gradle-maven-publish-plugin:0.22.0")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.20")
         classpath("org.mozilla.rust-android-gradle:plugin:0.9.3")
     }
 }

buildSrc/src/main/kotlin/Helpers.kt

@@ -68,9 +68,9 @@ fun Project.setupCore() {
             warning += "RestrictedApi"
             disable += "UseAppTint"
         }
-        ndkVersion = "21.4.7075529"
+        ndkVersion = "25.1.8937393"
     }
-    dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:1.1.6")
+    dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:2.0.0")
 }
 
 private val abiCodes = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4)

core/src/main/rust/linker-wrapper.py

@@ -25,6 +25,26 @@ def win2posix(path):
 
 args = [rustcc, os.environ['RUST_ANDROID_GRADLE_CC_LINK_ARG']] + sys.argv[1:]
 
+def update_in_place(arglist):
+    # The `gcc` library is not included starting from NDK version 23.
+    # Work around by using `unwind` replacement.
+    ndk_major_version = os.environ["CARGO_NDK_MAJOR_VERSION"]
+    if ndk_major_version.isdigit():
+        if 23 <= int(ndk_major_version):
+            for i, arg in enumerate(arglist):
+                if arg.startswith("-lgcc"):
+                    # This is one way to preserve line endings.
+                    arglist[i] = "-lunwind" + arg[len("-lgcc") :]
+
+
+update_in_place(args)
+
+for arg in args:
+    if arg.startswith("@"):
+        fileargs = open(arg[1:], "r").read().splitlines(keepends=True)
+        update_in_place(fileargs)
+        open(arg[1:], "w").write("".join(fileargs))
+
 linkargfileName = ''
 if (sys.platform == 'msys' or sys.platform == 'cygwin') and len(''.join(args)) > 8191:
     import codecs
@@ -48,7 +68,7 @@ def posix2win(path):
 
 
 # This only appears when the subprocess call fails, but it's helpful then.
-printable_cmd = ' '.join(pipes.quote(arg) for arg in args)
+printable_cmd = " ".join(pipes.quote(arg) for arg in args)
 print(printable_cmd)
 
 code = subprocess.call(args)

core/src/main/rust/shadowsocks-rust

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradle/wrapper/gradle-wrapper.jar

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew

@@ -15,9 +15,9 @@ android {
 }
 
 dependencies {
-    val cameraxVersion = "1.1.0"
+    val cameraxVersion = "1.2.0"
 
-    implementation("androidx.browser:browser:1.4.0")
+    implementation("androidx.browser:browser:1.5.0-alpha02")
     implementation("androidx.camera:camera-camera2:$cameraxVersion")
     implementation("androidx.camera:camera-lifecycle:$cameraxVersion")
     implementation("androidx.camera:camera-view:$cameraxVersion")

gradlew.bat

@@ -14,7 +14,7 @@ android {
 
 dependencies {
     api(kotlin("stdlib-jdk8"))
-    api("androidx.core:core-ktx:1.9.0")
-    api("androidx.fragment:fragment-ktx:1.5.5")
-    api("com.google.android.material:material:1.7.0")
+    api("androidx.core:core-ktx:1.7.0")
+    api("androidx.fragment:fragment-ktx:1.4.1")
+    api("com.google.android.material:material:1.6.0")
 }

mobile/build.gradle.kts

@@ -1,6 +1,6 @@
 rootProject.extra.apply {
-    set("androidPlugin", "com.android.tools.build:gradle:7.3.1")
-    set("kotlinVersion", "1.7.10")
+    set("androidPlugin", "com.android.tools.build:gradle:7.4.0-rc01")
+    set("kotlinVersion", "1.7.22")
 }
 
 repositories {