Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #2967

Merged
merged 2 commits into from
Dec 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ buildscript {
val kotlinVersion = rootProject.extra["kotlinVersion"].toString()
classpath(rootProject.extra["androidPlugin"].toString())
classpath(kotlin("gradle-plugin", kotlinVersion))
classpath("com.google.android.gms:oss-licenses-plugin:0.10.5")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.1")
classpath("com.google.gms:google-services:4.3.13")
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("org.mozilla.rust-android-gradle:plugin:0.9.3")
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/Helpers.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import org.gradle.kotlin.dsl.getByName
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import java.util.*

const val lifecycleVersion = "2.5.0"
const val lifecycleVersion = "2.5.1"

private val Project.android get() = extensions.getByName<BaseExtension>("android")
private val BaseExtension.lint get() = (this as CommonExtension<*, *, *, *>).lint
Expand All @@ -26,7 +26,7 @@ val Project.currentFlavor get() = gradle.startParameter.taskRequests.toString().

fun Project.setupCommon() {
android.apply {
buildToolsVersion("33.0.0")
buildToolsVersion("33.0.1")
compileSdkVersion(33)
defaultConfig {
minSdk = 23
Expand All @@ -50,8 +50,8 @@ fun Project.setupCommon() {

dependencies {
add("testImplementation", "junit:junit:4.13.2")
add("androidTestImplementation", "androidx.test:runner:1.4.0")
add("androidTestImplementation", "androidx.test.espresso:espresso-core:3.4.0")
add("androidTestImplementation", "androidx.test:runner:1.5.1")
add("androidTestImplementation", "androidx.test.espresso:espresso-core:3.5.0")
}
}

Expand Down
22 changes: 9 additions & 13 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import com.android.build.gradle.internal.tasks.factory.dependsOn
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.gradle.tasks.throwGradleExceptionIfError

plugins {
id("com.android.library")
Expand Down Expand Up @@ -48,8 +46,6 @@ cargo {
"logging",
"local-flow-stat",
"local-dns",
"armv8",
"neon",
Mygod marked this conversation as resolved.
Show resolved Hide resolved
"aead-cipher-2022",
))
exec = { spec, toolchain ->
Expand Down Expand Up @@ -89,28 +85,28 @@ tasks.clean.dependsOn("cargoClean")

dependencies {
val coroutinesVersion = "1.6.4"
val roomVersion = "2.4.2"
val roomVersion = "2.4.3"
val workVersion = "2.7.1"

api(project(":plugin"))
api("androidx.core:core-ktx:1.8.0")
api("androidx.fragment:fragment-ktx:1.5.0")
api("com.google.android.material:material:1.6.1")
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.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion")
api("androidx.preference:preference:1.2.0")
api("androidx.room:room-runtime:$roomVersion")
api("androidx.work:work-multiprocess:$workVersion")
api("androidx.work:work-runtime-ktx:$workVersion")
api("com.google.android.gms:play-services-oss-licenses:17.0.0")
api("com.google.code.gson:gson:2.9.0")
api("com.google.firebase:firebase-analytics-ktx:21.1.0")
api("com.google.firebase:firebase-crashlytics:18.2.11")
api("com.google.code.gson:gson:2.10")
api("com.google.firebase:firebase-analytics-ktx:21.2.0")
api("com.google.firebase:firebase-crashlytics:18.3.2")
api("com.jakewharton.timber:timber:5.0.1")
api("dnsjava:dnsjava:3.5.1")
api("dnsjava:dnsjava:3.5.2")
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion")
kapt("androidx.room:room-compiler:$roomVersion")
androidTestImplementation("androidx.room:room-testing:$roomVersion")
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.4")
}
2 changes: 1 addition & 1 deletion core/src/main/rust/shadowsocks-rust
Submodule shadowsocks-rust updated 61 files
+2 −38 .github/workflows/build-and-test.yml
+10 −17 .github/workflows/build-nightly-release.yml
+4 −14 .github/workflows/build-release.yml
+43 −0 .github/workflows/clippy-check.yml
+682 −517 Cargo.lock
+8 −14 Cargo.toml
+2 −2 Dockerfile
+13 −0 README.md
+6 −1 bin/ssservice.rs
+20 −17 bin/ssurl.rs
+130 −0 build/build-release-zigbuild
+2 −2 configs/genipset.py
+40 −6 configs/iptables_mixed.sh
+200 −63 configs/iptables_tproxy.sh
+1 −1 configs/log4rs.yaml
+146 −0 configs/shadowsocks.procd.sh
+10 −17 crates/shadowsocks-service/Cargo.toml
+138 −17 crates/shadowsocks-service/src/config.rs
+7 −6 crates/shadowsocks-service/src/local/context.rs
+23 −8 crates/shadowsocks-service/src/local/mod.rs
+29 −6 crates/shadowsocks-service/src/local/redir/tcprelay/sys/unix/bsd.rs
+69 −33 crates/shadowsocks-service/src/local/redir/tcprelay/sys/unix/linux.rs
+116 −17 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs
+134 −42 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/linux.rs
+2 −2 crates/shadowsocks-service/src/manager/mod.rs
+8 −3 crates/shadowsocks-service/src/manager/server.rs
+2 −2 crates/shadowsocks-service/src/net/flow.rs
+1 −0 crates/shadowsocks-service/src/server/context.rs
+12 −4 crates/shadowsocks-service/src/server/mod.rs
+0 −18 crates/shadowsocks-tools/Cargo.toml
+0 −184 crates/shadowsocks-tools/src/dns_pressure.rs
+8 −15 crates/shadowsocks/Cargo.toml
+24 −2 crates/shadowsocks/src/config.rs
+0 −33 crates/shadowsocks/src/context.rs
+44 −1 crates/shadowsocks/src/relay/socks5.rs
+5 −4 crates/shadowsocks/src/relay/udprelay/aead.rs
+4 −4 crates/shadowsocks/src/relay/udprelay/aead_2022.rs
+4 −10 crates/shadowsocks/src/relay/udprelay/crypto_io.rs
+151 −13 crates/shadowsocks/src/relay/udprelay/proxy_socket.rs
+5 −4 crates/shadowsocks/src/relay/udprelay/stream.rs
+28 −0 debian/changelog
+68 −24 homebrew/shadowsocks-rust.rb
+4 −0 k8s/chart/templates/service.yaml
+3 −1 k8s/chart/values.yaml
+2 −2 snap/snapcraft.yaml
+7 −9 src/config.rs
+2 −2 src/daemonize/unix.rs
+1 −1 src/lib.rs
+2 −2 src/password.rs
+44 −0 src/service/genkey.rs
+286 −240 src/service/local.rs
+161 −145 src/service/manager.rs
+1 −0 src/service/mod.rs
+156 −133 src/service/server.rs
+0 −1 src/sys.rs
+0 −66 src/validator/mod.rs
+74 −0 src/vparser/mod.rs
+15 −7 tests/socks4.rs
+19 −9 tests/socks5.rs
+4 −4 tests/tunnel.rs
+9 −9 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,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions mobile/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ dependencies {
implementation("androidx.camera:camera-view:$cameraxVersion")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("com.google.mlkit:barcode-scanning:17.0.2")
implementation("com.google.zxing:core:3.5.0")
implementation("com.google.mlkit:barcode-scanning:17.0.3")
implementation("com.google.zxing:core:3.5.1")
implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.4")
implementation("me.zhanghai.android.fastscroll:library:1.1.8")
Expand Down
6 changes: 3 additions & 3 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ android {

dependencies {
api(kotlin("stdlib-jdk8"))
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")
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")
Mygod marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 1 addition & 1 deletion repositories.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
rootProject.extra.apply {
set("androidPlugin", "com.android.tools.build:gradle:7.2.1")
set("androidPlugin", "com.android.tools.build:gradle:7.3.1")
set("kotlinVersion", "1.7.10")
}

Expand Down