Skip to content

Commit 9112fa2

Browse files
committed
Add windows server mode start process verify
Add linux deb dependencies Add backup recovery strategy select
1 parent 0a98515 commit 9112fa2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+399
-128
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
os: windows-latest
2020
arch: amd64
2121
- platform: linux
22-
os: ubuntu-latest
22+
os: ubuntu-22.04
2323
arch: amd64
2424
- platform: macos
2525
os: macos-13

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ on Mobile:
4141
⚠️ Make sure to install the following dependencies before using them
4242

4343
```bash
44-
sudo apt-get install appindicator3-0.1 libappindicator3-dev
45-
sudo apt-get install keybinder-3.0
44+
sudo apt-get install libayatana-appindicator3-dev
45+
sudo apt-get install libkeybinder-3.0-dev
4646
```
4747

4848
### Android

README_zh_CN.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ on Mobile:
4141
⚠️ 使用前请确保安装以下依赖
4242

4343
```bash
44-
sudo apt-get install appindicator3-0.1 libappindicator3-dev
45-
sudo apt-get install keybinder-3.0
44+
sudo apt-get install libayatana-appindicator3-dev
45+
sudo apt-get install libkeybinder-3.0-dev
4646
```
4747

4848
### Android

android/app/src/main/kotlin/com/follow/clash/services/FlClashVpnService.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.follow.clash.services
22

33
import android.annotation.SuppressLint
4-
import android.app.PendingIntent
54
import android.content.Intent
65
import android.net.ProxyInfo
76
import android.net.VpnService

android/core/build.gradle.kts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import com.android.build.gradle.tasks.MergeSourceSetFolders
2-
31
plugins {
42
id("com.android.library")
53
id("org.jetbrains.kotlin.android")
@@ -37,14 +35,18 @@ android {
3735
}
3836
}
3937

40-
compileOptions {
41-
sourceCompatibility = JavaVersion.VERSION_11
42-
targetCompatibility = JavaVersion.VERSION_11
43-
}
4438
kotlinOptions {
45-
jvmTarget = "11"
39+
jvmTarget = "17"
40+
}
41+
42+
compileOptions {
43+
sourceCompatibility = JavaVersion.VERSION_17
44+
targetCompatibility = JavaVersion.VERSION_17
4645
}
4746
}
47+
dependencies {
48+
implementation("androidx.annotation:annotation-jvm:1.9.1")
49+
}
4850

4951
val copyNativeLibs by tasks.register<Copy>("copyNativeLibs") {
5052
doFirst {
@@ -58,8 +60,4 @@ afterEvaluate {
5860
tasks.named("preBuild") {
5961
dependsOn(copyNativeLibs)
6062
}
61-
}
62-
63-
dependencies {
64-
implementation("androidx.core:core-ktx:1.16.0")
6563
}

android/core/src/main/cpp/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
2121
-Wl,--strip-all
2222
-Wl,--exclude-libs=ALL
2323
)
24+
25+
add_compile_options(-fvisibility=hidden -fvisibility-inlines-hidden)
2426
endif ()
2527

2628
set(LIB_CLASH_PATH "${CMAKE_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libclash.so")

arb/intl_en.arb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,5 +395,10 @@
395395
"textScale": "Text Scaling",
396396
"internet": "Internet",
397397
"systemApp": "System APP",
398-
"noNetworkApp": "No network App"
398+
"noNetworkApp": "No network APP",
399+
"contactMe": "Contact me",
400+
"recoveryStrategy": "Recovery strategy",
401+
"recoveryStrategy_override": "Override",
402+
"recoveryStrategy_compatible": "Compatible",
403+
"logsTest": "Logs test"
399404
}

arb/intl_ja.arb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,5 +396,10 @@
396396
"textScale": "テキストスケーリング",
397397
"internet": "インターネット",
398398
"systemApp": "システムアプリ",
399-
"noNetworkApp": "ネットワークなしアプリ"
399+
"noNetworkApp": "ネットワークなしアプリ",
400+
"contactMe": "連絡する",
401+
"recoveryStrategy": "リカバリー戦略",
402+
"recoveryStrategy_override": "オーバーライド",
403+
"recoveryStrategy_compatible": "互換性",
404+
"logsTest": "ログテスト"
400405
}

arb/intl_ru.arb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,5 +396,10 @@
396396
"textScale": "Масштабирование текста",
397397
"internet": "Интернет",
398398
"systemApp": "Системное приложение",
399-
"noNetworkApp": "Приложение без сети"
399+
"noNetworkApp": "Приложение без сети",
400+
"contactMe": "Свяжитесь со мной",
401+
"recoveryStrategy": "Стратегия восстановления",
402+
"recoveryStrategy_override": "Переопределение",
403+
"recoveryStrategy_compatible": "Совместимый",
404+
"logsTest": "Тест журналов"
400405
}

arb/intl_zh_CN.arb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,5 +396,10 @@
396396
"textScale": "文本缩放",
397397
"internet": "互联网",
398398
"systemApp": "系统应用",
399-
"noNetworkApp": "无网络应用"
399+
"noNetworkApp": "无网络应用",
400+
"contactMe": "联系我",
401+
"recoveryStrategy": "恢复策略",
402+
"recoveryStrategy_override": "覆盖",
403+
"recoveryStrategy_compatible": "兼容",
404+
"logsTest": "日志测试"
400405
}

0 commit comments

Comments
 (0)