diff --git a/FAQ.md b/FAQ.md index 9c8d33b2d..593ff296b 100644 --- a/FAQ.md +++ b/FAQ.md @@ -70,5 +70,5 @@ Scala on Android已经停止维护多年，本项目基于最新SS Android客户 ## 下载地址 -* [GitHub](https://github.com/shadowsocksRb/shadowsocksRb-android/releases) -* [Telegram](https://t.me/ShadowsocksRb) +* [GitHub](https://github.com/ShadowsocksR-Live/ssrdroid/releases) + diff --git a/README.md b/README.md index 1ef63a743..2cb235d00 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ #### 獲取源碼 ```shell script -git clone --recurse-submodules https://github.com/ssrlive/ssrDroid3.git -cd ssrDroid3 +git clone --recursive https://github.com/ShadowsocksR-Live/ssrDroid.git +cd ssrDroid ``` #### 編譯 @@ -46,7 +46,7 @@ GPLv3
  • tun2socks: BSD
  • pcre: BSD
  • libancillary: BSD
    • -
  • shadowsocksr-libev: GPLv3
    • +
  • ssr-libev: GPLv3
  • libsodium: ISC
    • diff --git a/build.gradle b/build.gradle index f3dd83e48..43c90aa73 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ ext { + appBinaryName = "ssrdroid" javaVersion = JavaVersion.VERSION_1_8 ndkVersion = '24.0.8215888' minSdkVersion = 21 diff --git a/core/build.gradle b/core/build.gradle index 779a5ee50..0f0ca997d 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -6,6 +6,7 @@ plugins { } android { + namespace 'com.github.shadowsocks.core' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index 10d2b2b4e..11f306e5c 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ = 24 && !Core.user.isUserUnlocked) return diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml index d88b2b02b..8be169745 100644 --- a/core/src/main/res/values-zh-rCN/strings.xml +++ b/core/src/main/res/values-zh-rCN/strings.xml @@ -98,9 +98,9 @@ "配置文件" "设置选项" "常见问题" - https://github.com/shadowsocksRb/shadowsocksRb-android/blob/master/FAQ.md + https://github.com/ShadowsocksR-Live/ssrdroid/blob/master/FAQ.md "关于" - "ShadowsocksRb %s" + "ssrDroid %s" "编辑" "分享" "添加配置文件" diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 926226caf..534f6d319 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - ShadowsocksRb + ssrDroid Toggle Send email @@ -99,7 +99,7 @@ Profiles Settings FAQ - https://github.com/shadowsocksRb/shadowsocksRb-android/blob/master/FAQ.md + https://github.com/ShadowsocksR-Live/ssrdroid/blob/master/FAQ.md About Shadowsocks %s Edit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a254..2e6e5897b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mobile/build.gradle b/mobile/build.gradle index 8baded227..12e687bd0 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -5,11 +5,12 @@ plugins { } android { + namespace 'com.github.shadowsocks' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion defaultConfig { - applicationId "io.github.shadowsocksrb" + applicationId "com.ssrlive.ssrdroid" minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.sdkVersion versionCode rootProject.versionCode @@ -32,11 +33,21 @@ android { '-Xmultifile-parts-inherit', ] } + applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "${appBinaryName}_${variant.buildType.name}_${defaultConfig.versionName}.apk" + } + } } debug { applicationIdSuffix '.debug' versionNameSuffix '-debug' resValue 'string', 'applicationId', defaultConfig.applicationId + applicationIdSuffix + applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "${appBinaryName}_${variant.buildType.name}_${defaultConfig.versionName}.apk" + } + } } } signingConfigs { diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml index 95863171f..1e718ae45 100644 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/mobile/src/main/res/raw/about.html b/mobile/src/main/res/raw/about.html index af18a340a..98d508ddb 100644 --- a/mobile/src/main/res/raw/about.html +++ b/mobile/src/main/res/raw/about.html @@ -25,7 +25,7 @@

    Open Source Licenses

  • tun2socks: BSD 
  • pcre: BSD 
  • libancillary: BSD 
    • -
  • shadowsocksr-libev: GPLv3 
    • +
  • ssr-libev: GPLv3 
  • libsodium: ISC 
      • diff --git a/plugin/build.gradle b/plugin/build.gradle index 578dd75d9..bb22fe88b 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -5,6 +5,7 @@ plugins { } android { + namespace 'com.github.shadowsocks.plugin' compileSdkVersion rootProject.compileSdkVersion buildToolsVersion rootProject.buildToolsVersion ndkVersion rootProject.ndkVersion diff --git a/plugin/src/main/AndroidManifest.xml b/plugin/src/main/AndroidManifest.xml index 117570c54..6fdb60126 100644 --- a/plugin/src/main/AndroidManifest.xml +++ b/plugin/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/settings.gradle b/settings.gradle index f3a9571c4..ad74650af 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,7 @@ pluginManagement { mavenCentral() } plugins { - def agp = '7.1.3' + def agp = '7.2.0' def kotlin = '1.5.21' id 'com.android.application' version agp id 'com.android.library' version agp diff --git a/update.json b/update.json index 7a70dc9b7..9eec9249f 100644 --- a/update.json +++ b/update.json @@ -2,5 +2,5 @@ "version": "408", "title": "检测到新版本", "text": "请尽快更新", - "uri": "https://github.com/shadowsocksRb/shadowsocksRb-android/releases/latest" + "uri": "https://github.com/ShadowsocksR-Live/ssrdroid/releases/latest" }