Skip to content

Commit

Permalink
v7.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
maskedeken committed Jun 22, 2024
2 parents 299501e + 278ce50 commit ca1b8a2
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 77 deletions.
42 changes: 21 additions & 21 deletions XrayCore/go.mod
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
module XrayCore

go 1.22.3
go 1.22.4

require github.com/xtls/xray-core v1.8.13
require github.com/xtls/xray-core v1.8.16

require (
github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/cloudflare/circl v1.3.8 // indirect
github.com/cloudflare/circl v1.3.9 // indirect
github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/onsi/ginkgo/v2 v2.16.0 // indirect
github.com/onsi/ginkgo/v2 v2.19.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pires/go-proxyproto v0.7.0 // indirect
github.com/quic-go/quic-go v0.44.0 // indirect
github.com/quic-go/quic-go v0.45.0 // indirect
github.com/refraction-networking/utls v1.6.6 // indirect
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
github.com/sagernet/sing v0.3.8 // indirect
github.com/sagernet/sing v0.4.1 // indirect
github.com/sagernet/sing-shadowsocks v0.2.6 // indirect
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb // indirect
github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
Expand All @@ -33,25 +33,25 @@ require (
github.com/xtls/reality v0.0.0-20240429224917-ecc4401070cc // indirect
go.uber.org/mock v0.4.0 // indirect
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
golang.org/x/mobile v0.0.0-20240604190613-2782386b8afd // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489 // indirect
lukechampine.com/blake3 v1.3.0 // indirect
)

replace github.com/xtls/xray-core => github.com/maskedeken/xray-core v1.8.13
replace github.com/xtls/xray-core => github.com/maskedeken/xray-core v1.8.16

replace github.com/sagernet/sing-shadowsocks => github.com/maskedeken/sing-shadowsocks v0.0.0-20231227033938-788ce73cde0a
91 changes: 43 additions & 48 deletions XrayCore/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ android {
minSdk = 26
targetSdk = 34
versionCode = calcVersionCode(0)
versionName = "6.9.0"
versionName = "7.0.0"

vectorDrawables.useSupportLibrary = true
vectorDrawables.generatedDensities = []
Expand Down
2 changes: 1 addition & 1 deletion app/versionCode.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
320
330
6 changes: 3 additions & 3 deletions build-xray.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ ANDROID_PLATFORM_VERSION="android-34"
ANDROID_SDK_VERSION="34.0.0"
ANDROID_NDK_VERSION="26.2.11394342"
JAVA_VERSION="17"
GRADLE_VERSION="8.6"
GO_VERSION="go1.22.3"
GO_MOBILE_VERSION="v0.0.0-20240520174638-fa72addaaa1b"
GRADLE_VERSION="8.7"
GO_VERSION="go1.22.4"
GO_MOBILE_VERSION="v0.0.0-20240604190613-2782386b8afd"

# Install Tools
apt-get install -t bookworm-backports -y golang-go
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.4.1" apply false
id("com.android.application") version "8.5.0" apply false
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
id("com.google.devtools.ksp") version "1.9.22-1.0.17" apply false
}
2 changes: 1 addition & 1 deletion buildXrayCore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ prepare_go() {
# go mod init XrayCore
# go mod tidy
# go get golang.org/x/mobile
go install golang.org/x/mobile/cmd/[email protected]20240520174638-fa72addaaa1b
go install golang.org/x/mobile/cmd/[email protected]20240604190613-2782386b8afd
go mod download
}

Expand Down
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 @@
#Tue Jul 11 19:53:33 IRST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions metadata/en-US/changelogs/334.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Xray-core @ v1.8.16

0 comments on commit ca1b8a2

Please sign in to comment.