Update dependencies

Author: Mygod

buildSrc/src/main/kotlin/Helpers.kt

@@ -24,7 +24,7 @@ fun Project.setupCommon() {
         compileSdkVersion(36)
         defaultConfig {
             minSdk = 23
-            targetSdk = 35
+            targetSdk = 36
             testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         }
         compileOptions {

core/src/main/java/com/github/shadowsocks/bg/BaseService.kt

@@ -29,6 +29,7 @@ import android.os.IBinder
 import android.os.RemoteCallbackList
 import android.os.RemoteException
 import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
 import com.github.shadowsocks.BootReceiver
 import com.github.shadowsocks.Core
 import com.github.shadowsocks.Core.app
@@ -43,10 +44,17 @@ import com.github.shadowsocks.utils.Action
 import com.github.shadowsocks.utils.broadcastReceiver
 import com.github.shadowsocks.utils.readableMessage
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.analytics.logEvent
-import com.google.firebase.ktx.Firebase
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
@@ -269,7 +277,8 @@ object BaseService {
             // channge the state
             data.changeState(State.Stopping)
             GlobalScope.launch(Dispatchers.Main.immediate) {
-                Firebase.analytics.logEvent("stop") { param(FirebaseAnalytics.Param.METHOD, tag) }
+                FirebaseAnalytics.getInstance(this@Interface as Service).logEvent("stop",
+                    bundleOf(FirebaseAnalytics.Param.METHOD to tag))
                 data.connectingJob?.cancelAndJoin() // ensure stop connecting first
                 this@Interface as Service
                 // we use a coroutineScope here to allow clean-up in parallel
@@ -344,7 +353,8 @@ object BaseService {
             }
 
             data.notification = createNotification(profile.formattedName)
-            Firebase.analytics.logEvent("start") { param(FirebaseAnalytics.Param.METHOD, tag) }
+            FirebaseAnalytics.getInstance(this).logEvent("start",
+                bundleOf(FirebaseAnalytics.Param.METHOD to tag))
 
             data.changeState(State.Connecting)
             data.connectingJob = GlobalScope.launch(Dispatchers.Main.immediate) {

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ff1d4fc92bcfc9d3799beabb4e70cfa3/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/08ce182188ada0b93565cd9ca4a4ab32/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5760d82d08e6c26884debb23736ea57/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/08ce182188ada0b93565cd9ca4a4ab32/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/021e528cbed860c875a9016f29ee13c1/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/6141bf023dcc7a96c47cad75c59b054e/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ff1d4fc92bcfc9d3799beabb4e70cfa3/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/08ce182188ada0b93565cd9ca4a4ab32/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/22860963aebba7217b72b98c4f9a5cfb/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/a6eb06d81d82a782734ef3b616ba2684/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=21

gradle/libs.versions.toml

@@ -1,54 +1,55 @@
 [versions]
-camera = "1.4.2"
+camera = "1.5.2"
 coroutines = "1.10.2"
-lifecycle = "2.9.1"
-room = "2.7.2"
-work = "2.10.2"
+lifecycle = "2.10.0"
+room = "2.8.4"
+work = "2.11.0"
 
 [libraries]
-android-gradle = "com.android.tools.build:gradle:8.11.1"
-androidx-browser = "androidx.browser:browser:1.8.0"
+android-gradle = "com.android.tools.build:gradle:8.13.2"
+androidx-browser = "androidx.browser:browser:1.9.0"
 androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
 androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }
 androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "camera" }
-androidx-concurrent-futures-ktx = "androidx.concurrent:concurrent-futures-ktx:1.2.0"
+androidx-concurrent-futures-ktx = "androidx.concurrent:concurrent-futures-ktx:1.3.0"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1"
-androidx-core-ktx = "androidx.core:core-ktx:1.16.0"
-androidx-espresso-core = "androidx.test.espresso:espresso-core:3.6.1"
-androidx-junit-ktx = "androidx.test.ext:junit-ktx:1.2.1"
+androidx-core-ktx = "androidx.core:core-ktx:1.17.0"
+androidx-espresso-core = "androidx.test.espresso:espresso-core:3.7.0"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.8.9"
+androidx-junit-ktx = "androidx.test.ext:junit-ktx:1.3.0"
 androidx-leanback-preference = "androidx.leanback:leanback-preference:1.2.0"
 androidx-lifecycle-livedata-core-ktx = { module = "androidx.lifecycle:lifecycle-livedata-core-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx-preference = "androidx.preference:preference:1.2.1"
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
-androidx-test-runner = "androidx.test:runner:1.6.2"
+androidx-test-runner = "androidx.test:runner:1.7.0"
 androidx-work-multiprocess = { module = "androidx.work:work-multiprocess", version.ref = "work" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }
 barcode-scanning = "com.google.mlkit:barcode-scanning:17.3.0"
 desugar = "com.android.tools:desugar_jdk_libs:2.1.5"
-dnsjava = "dnsjava:dnsjava:3.6.3"
-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
+dnsjava = "dnsjava:dnsjava:3.6.4"
+dokka = "org.jetbrains.dokka:dokka-gradle-plugin:2.1.0"
 fastscroll = "me.zhanghai.android.fastscroll:library:1.3.0"
-firebase-analytics = "com.google.firebase:firebase-analytics:22.5.0"
-firebase-crashlytics = "com.google.firebase:firebase-crashlytics:19.4.4"
-firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:3.0.4"
-google-oss-licenses = "com.google.android.gms:oss-licenses-plugin:0.10.6"
-google-services = "com.google.gms:google-services:4.4.3"
-gradle-maven-publish = "com.vanniktech:gradle-maven-publish-plugin:0.33.0"
+firebase-analytics = "com.google.firebase:firebase-analytics:23.0.0"
+firebase-crashlytics = "com.google.firebase:firebase-crashlytics:20.0.4"
+firebase-crashlytics-gradle = "com.google.firebase:firebase-crashlytics-gradle:3.0.6"
+google-oss-licenses = "com.google.android.gms:oss-licenses-plugin:0.10.10"
+google-services = "com.google.gms:google-services:4.4.4"
+gradle-maven-publish = "com.vanniktech:gradle-maven-publish-plugin:0.36.0"
 junit = "junit:junit:4.13.2"
 kotlin-gradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0"
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "coroutines" }
 locale-api = "com.twofortyfouram:android-plugin-api-for-locale:1.0.4"
-material = "com.google.android.material:material:1.12.0"
-play-services-oss-licenses = "com.google.android.gms:play-services-oss-licenses:17.2.0"
+material = "com.google.android.material:material:1.13.0"
+play-services-oss-licenses = "com.google.android.gms:play-services-oss-licenses:17.3.0"
 preferencex-simplemenu = "com.takisoft.preferencex:preferencex-simplemenu:1.1.0"
 rust-android = "org.mozilla.rust-android-gradle:plugin:0.9.6"
 timber = "com.jakewharton.timber:timber:5.0.1"
-zxing = "com.google.zxing:core:3.5.3"
+zxing = "com.google.zxing:core:3.5.4"
 
 [plugins]
-ksp = "com.google.devtools.ksp:2.2.0-2.0.2"
-versions = "com.github.ben-manes.versions:0.52.0"
+ksp = "com.google.devtools.ksp:2.3.4"
+versions = "com.github.ben-manes.versions:0.53.0"

mobile/src/main/java/com/github/shadowsocks/MainActivity.kt

@@ -53,9 +53,7 @@ import com.github.shadowsocks.widget.ServiceButton
 import com.github.shadowsocks.widget.StatsBar
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.analytics.logEvent
-import com.google.firebase.ktx.Firebase
+import com.google.firebase.analytics.FirebaseAnalytics
 
 class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPreferenceDataStoreChangeListener,
         NavigationView.OnNavigationItemSelectedListener {
@@ -204,7 +202,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
                 }
                 R.id.globalSettings -> displayFragment(GlobalSettingsFragment())
                 R.id.about -> {
-                    Firebase.analytics.logEvent("about") { }
+                    FirebaseAnalytics.getInstance(this).logEvent("about", null)
                     displayFragment(AboutFragment())
                 }
                 R.id.faq -> {

plugin/build.gradle.kts

@@ -14,9 +14,9 @@ android {
 
 dependencies {
     coreLibraryDesugaring(libs.desugar)
-    api("androidx.core:core-ktx:1.7.0")
-    api("androidx.fragment:fragment-ktx:1.5.5")
-    api("com.google.android.material:material:1.6.0")
+    api(libs.androidx.core.ktx)
+    api(libs.androidx.fragment.ktx)
+    api(libs.material)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.androidx.espresso.core)

settings.gradle.kts

@@ -1 +1,4 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
 include(":core", ":plugin", ":mobile", ":tv")