Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Mygod committed Nov 2, 2024
1 parent 970eb2b commit 5b09ba1
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 23 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

plugins {
id("com.github.ben-manes.versions") version "0.51.0"
id("com.google.devtools.ksp") version "2.0.20-1.0.24" apply false
id("com.google.devtools.ksp") version "2.0.21-1.0.26" apply false
}

buildscript {
Expand All @@ -21,7 +21,7 @@ buildscript {
classpath("com.google.android.gms:oss-licenses-plugin:0.10.6")
classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.2")
classpath("com.google.gms:google-services:4.4.2")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.29.0")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.30.0")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
classpath("org.mozilla.rust-android-gradle:plugin:0.9.4")
}
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/Helpers.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
import java.util.Locale

const val lifecycleVersion = "2.8.4"
const val lifecycleVersion = "2.8.7"

private val Project.android get() = extensions.getByName<BaseExtension>("android")
private val BaseExtension.lint get() = (this as CommonExtension<*, *, *, *, *, *>).lint
Expand Down Expand Up @@ -64,9 +64,9 @@ fun Project.setupCore() {
disable += "UseAppTint"
}
buildFeatures.buildConfig = true
ndkVersion = "27.0.12077973"
ndkVersion = "27.2.12479018"
}
dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:2.1.1")
dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:2.1.2")
}

fun Project.setupApp() {
Expand Down
12 changes: 6 additions & 6 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ tasks.register<Exec>("cargoClean") {
tasks.clean.dependsOn("cargoClean")

dependencies {
val coroutinesVersion = "1.8.1"
val coroutinesVersion = "1.9.0"
val roomVersion = "2.6.1"
val workVersion = "2.9.1"
val workVersion = "2.10.0"

api(project(":plugin"))
api("androidx.core:core-ktx:1.13.1")
api("androidx.core:core-ktx:1.15.0")
api("com.google.android.material:material:1.12.0")

api("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion")
Expand All @@ -103,10 +103,10 @@ dependencies {
api("androidx.work:work-runtime-ktx:$workVersion")
api("com.google.android.gms:play-services-oss-licenses:17.1.0")
api("com.google.code.gson:gson:2.11.0")
api("com.google.firebase:firebase-analytics:22.1.0")
api("com.google.firebase:firebase-crashlytics:19.0.3")
api("com.google.firebase:firebase-analytics:22.1.2")
api("com.google.firebase:firebase-crashlytics:19.2.1")
api("com.jakewharton.timber:timber:5.0.1")
api("dnsjava:dnsjava:3.6.1")
api("dnsjava:dnsjava:3.6.2")
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion")
ksp("androidx.room:room-compiler:$roomVersion")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ sealed class DnsResolverCompat {
* See also: https://issuetracker.google.com/issues/133874590
*/
private val unboundedIO by lazy {
if (Core.activity.isLowRamDevice) Dispatchers.IO else Dispatchers.IO.limitedParallelism(Int.MAX_VALUE)
if (Core.activity.isLowRamDevice) Dispatchers.IO
else Dispatchers.IO.limitedParallelism(Int.MAX_VALUE, "unboundedIO")
}

override suspend fun resolve(network: Network, host: String) =
Expand Down
1 change: 1 addition & 0 deletions core/src/main/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ TUN2SOCKS_SOURCES := \
base/BPending.c \
system/BDatagram_unix.c \
flowextra/PacketPassInactivityMonitor.c \
socks_udp_client/SocksUdpClient.c \
tun2socks/SocksUdpGwClient.c \
udpgw_client/UdpGwClient.c

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/jni/libancillary
Submodule libancillary updated 3 files
+24 −0 CMakeLists.txt
+1 −0 README
+3 −0 README.md
2 changes: 1 addition & 1 deletion core/src/main/rust/shadowsocks-rust
Submodule shadowsocks-rust updated 69 files
+2 −2 .circleci/config.yml
+1 −20 .github/dependabot.yml
+4 −4 .github/workflows/build-docker-image.yml
+3 −3 .github/workflows/build-release.yml
+441 −356 Cargo.lock
+3 −11 Cargo.toml
+1 −1 Dockerfile
+11 −11 crates/shadowsocks-service/Cargo.toml
+27 −0 crates/shadowsocks-service/src/config.rs
+1 −1 crates/shadowsocks-service/src/local/dns/upstream.rs
+70 −19 crates/shadowsocks-service/src/local/http/http_client.rs
+8 −0 crates/shadowsocks-service/src/local/http/http_service.rs
+11 −5 crates/shadowsocks-service/src/local/http/http_stream.rs
+4 −8 crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs
+2 −2 crates/shadowsocks-service/src/local/loadbalancing/server_data.rs
+1 −1 crates/shadowsocks-service/src/local/loadbalancing/server_stat.rs
+2 −2 crates/shadowsocks-service/src/local/net/udp/association.rs
+2 −2 crates/shadowsocks-service/src/local/redir/sys/mod.rs
+5 −0 crates/shadowsocks-service/src/local/redir/sys/unix/mod.rs
+16,756 −0 crates/shadowsocks-service/src/local/redir/sys/unix/pfvar_bindgen_openbsd.rs
+3 −1 crates/shadowsocks-service/src/local/redir/tcprelay/sys/unix/bsd.rs
+2 −1 crates/shadowsocks-service/src/local/redir/tcprelay/sys/unix/mod.rs
+2 −34 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/freebsd.rs
+3 −11 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/linux.rs
+2 −10 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs
+5 −2 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/mod.rs
+352 −0 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/openbsd.rs
+2 −2 crates/shadowsocks-service/src/local/socks/server/mod.rs
+15 −0 crates/shadowsocks-service/src/local/tun/fake_tun.rs
+4 −12 crates/shadowsocks-service/src/local/tun/mod.rs
+1 −1 crates/shadowsocks-service/src/local/tun/tcp.rs
+33 −19 crates/shadowsocks-service/src/net/mon_socket.rs
+11 −10 crates/shadowsocks-service/src/server/udprelay.rs
+2 −2 crates/shadowsocks/Cargo.toml
+2 −2 crates/shadowsocks/src/context.rs
+1 −1 crates/shadowsocks/src/dns_resolver/resolver.rs
+1 −0 crates/shadowsocks/src/manager/datagram.rs
+1 −0 crates/shadowsocks/src/manager/listener.rs
+1 −1 crates/shadowsocks/src/net/sys/mod.rs
+4 −0 crates/shadowsocks/src/net/sys/unix/bsd/macos.rs
+6 −0 crates/shadowsocks/src/net/sys/unix/linux/mod.rs
+1 −0 crates/shadowsocks/src/net/tcp.rs
+2 −3 crates/shadowsocks/src/net/udp.rs
+1 −0 crates/shadowsocks/src/plugin/mod.rs
+2 −0 crates/shadowsocks/src/relay/tcprelay/aead.rs
+10 −1 crates/shadowsocks/src/relay/tcprelay/crypto_io.rs
+1 −0 crates/shadowsocks/src/relay/tcprelay/proxy_listener.rs
+3 −0 crates/shadowsocks/src/relay/tcprelay/proxy_stream/client.rs
+2 −0 crates/shadowsocks/src/relay/tcprelay/proxy_stream/protocol/mod.rs
+2 −0 crates/shadowsocks/src/relay/tcprelay/proxy_stream/protocol/v1.rs
+1 −0 crates/shadowsocks/src/relay/tcprelay/proxy_stream/protocol/v2.rs
+2 −0 crates/shadowsocks/src/relay/tcprelay/proxy_stream/server.rs
+209 −0 crates/shadowsocks/src/relay/udprelay/compat.rs
+2 −0 crates/shadowsocks/src/relay/udprelay/mod.rs
+159 −77 crates/shadowsocks/src/relay/udprelay/proxy_socket.rs
+9 −1 crates/shadowsocks/src/security/replay/mod.rs
+1 −0 crates/shadowsocks/src/security/replay/ppbloom.rs
+3 −2 crates/shadowsocks/tests/udp.rs
+23 −0 debian/changelog
+1 −1 debian/compat
+1 −1 debian/config.json
+1 −1 debian/control
+1 −0 debian/[email protected]
+1 −0 debian/[email protected]
+4 −8 debian/shadowsocks-rust.postinst
+1 −2 debian/shadowsocks-rust.service
+29 −0 renovate.json
+3 −2 src/service/local.rs
+0 −1 tests/udp.rs
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 3 additions & 2 deletions mobile/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ android {
}

dependencies {
val cameraxVersion = "1.3.4"
val cameraxVersion = "1.4.0"

implementation("androidx.browser:browser:1.8.0")
implementation("androidx.camera:camera-camera2:$cameraxVersion")
implementation("androidx.camera:camera-lifecycle:$cameraxVersion")
implementation("androidx.camera:camera-view:$cameraxVersion")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.concurrent:concurrent-futures-ktx:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.2.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("com.google.mlkit:barcode-scanning:17.3.0")
implementation("com.google.zxing:core:3.5.3")
Expand Down
16 changes: 13 additions & 3 deletions mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,19 @@ import android.view.MenuItem
import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
import androidx.camera.core.*
import androidx.camera.core.Camera
import androidx.camera.core.CameraSelector
import androidx.camera.core.ExperimentalGetImage
import androidx.camera.core.ImageAnalysis
import androidx.camera.core.ImageProxy
import androidx.camera.core.Preview
import androidx.camera.core.resolutionselector.ResolutionSelector
import androidx.camera.core.resolutionselector.ResolutionStrategy
import androidx.camera.lifecycle.ProcessCameraProvider
import androidx.camera.view.PreviewView
import androidx.concurrent.futures.await
import androidx.core.content.getSystemService
import androidx.lifecycle.lifecycleScope
import androidx.work.await
import com.github.shadowsocks.Core.app
import com.github.shadowsocks.database.Profile
import com.github.shadowsocks.database.ProfileManager
Expand All @@ -50,8 +55,13 @@ import com.google.mlkit.vision.barcode.BarcodeScanning
import com.google.mlkit.vision.barcode.ZoomSuggestionOptions
import com.google.mlkit.vision.barcode.common.Barcode
import com.google.mlkit.vision.common.InputImage
import kotlinx.coroutines.*
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.asExecutor
import kotlinx.coroutines.launch
import kotlinx.coroutines.tasks.await
import kotlinx.coroutines.withContext
import timber.log.Timber

class ScannerActivity : AppCompatActivity(), ImageAnalysis.Analyzer, ZoomSuggestionOptions.ZoomCallback {
Expand Down
4 changes: 2 additions & 2 deletions repositories.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rootProject.extra.apply {
set("androidPlugin", "com.android.tools.build:gradle:8.5.2")
set("kotlinVersion", "2.0.20")
set("androidPlugin", "com.android.tools.build:gradle:8.7.2")
set("kotlinVersion", "2.0.21")
}

repositories {
Expand Down

0 comments on commit 5b09ba1

Please sign in to comment.