diff --git a/README-ru.md b/README-ru.md index 6225e2d..87505f4 100644 --- a/README-ru.md +++ b/README-ru.md @@ -56,4 +56,22 @@ DPI (Deep Packet Inspection) - это технология для анализа - [ByeDPI](https://github.com/hufrea/byedpi) - [Tun2Socks](https://github.com/dovecoteescapee/tun2socks)* - *форк с добавление раздельного тунелирования TCP и UDP + *форк с добавлением раздельного тунелирования TCP и UDP + +## Сборка + +Для сборки приложения требуется: + +1. JDK 8 или новее +2. Android SDK +3. Android NDK +4. Go 1.22 или новее +5. CMake 3.22.1 или новее + +Сборка приложения: + +1. Клонируйте репозиторий с подмодулями: + `git clone --recurse-submodules` +2. Запустите скрипт сборки из корня репозитория: + `./gradlew assembleRelease` +3. APK будет лежать в `app/build/outputs/apk/release/` diff --git a/README.md b/README.md index ecd37a7..31c7cd1 100644 --- a/README.md +++ b/README.md @@ -57,3 +57,21 @@ DPI (Deep Packet Inspection) is a technology for analyzing and filtering traffic - [ByeDPI](https://github.com/hufrea/byedpi) - [Tun2Socks](https://github.com/dovecoteescapee/tun2socks)* *fork with the addition of separate tunneling of TCP and UDP + +## Building + +For building the application, you need: + +1. JDK 8 or later +2. Android SDK +3. Android NDK +4. Go 1.22 or later +5. CMake 3.22.1 or later + +To build the application: + +1. Clone the repository with submodules: + `git clone --recurse-submodules` +2. Run the build script from the root of the repository: + `./gradlew assembleRelease` +3. The APK will be in `app/build/outputs/apk/release/` diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b04afda..c977dcb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,18 +55,18 @@ android { dependencies { implementation(files("libs/tun2socks.aar")) - implementation("androidx.fragment:fragment-ktx:1.6.2") - implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.appcompat:appcompat:1.6.1") + implementation("androidx.fragment:fragment-ktx:1.8.2") + implementation("androidx.core:core-ktx:1.13.1") + implementation("androidx.appcompat:appcompat:1.7.0") implementation("androidx.preference:preference-ktx:1.2.1") implementation("com.takisoft.preferencex:preferencex:1.1.0") - implementation("com.google.android.material:material:1.11.0") + implementation("com.google.android.material:material:1.12.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") - implementation("androidx.lifecycle:lifecycle-service:2.7.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4") + implementation("androidx.lifecycle:lifecycle-service:2.8.4") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.5") - androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.test.ext:junit:1.2.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") } abstract class BuildTun2Socks : DefaultTask() { diff --git a/app/libs/tun2socks b/app/libs/tun2socks index 8a8571c..b357c5b 160000 --- a/app/libs/tun2socks +++ b/app/libs/tun2socks @@ -1 +1 @@ -Subproject commit 8a8571c7590afa687a2c229ae84dfea114004333 +Subproject commit b357c5b50ac07aa36aed843b803df06a307fe61a