SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-04 12:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
世界 2023-07-30 15:51:13 +08:00
parent cb9799936b
commit 2e3950d997
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
5 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/build.gradle
View file

@ -19,7 +19,7 @@ android {
defaultConfig { defaultConfig {
applicationId "io.nekohasekai.sfa" applicationId "io.nekohasekai.sfa"
minSdk 21 minSdk 21
targetSdk 33 targetSdk 34
versionCode getProps("VERSION_CODE").toInteger() versionCode getProps("VERSION_CODE").toInteger()
versionName getProps("VERSION_NAME") versionName getProps("VERSION_NAME")
setProperty("archivesBaseName", "SFA-" + versionName) setProperty("archivesBaseName", "SFA-" + versionName)
@ -89,15 +89,15 @@ dependencies {
ksp 'androidx.room:room-compiler:2.5.2' ksp 'androidx.room:room-compiler:2.5.2'
implementation 'androidx.work:work-runtime-ktx:2.8.1' implementation 'androidx.work:work-runtime-ktx:2.8.1'
implementation 'androidx.browser:browser:1.5.0' implementation 'androidx.browser:browser:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
// DO NOT UPDATE (minSdkVersion updated) // DO NOT UPDATE (minSdkVersion updated)
implementation 'com.blacksquircle.ui:editorkit:2.2.0' implementation 'com.blacksquircle.ui:editorkit:2.2.0'
implementation 'com.blacksquircle.ui:language-json:2.2.0' implementation 'com.blacksquircle.ui:language-json:2.2.0'
implementation 'com.microsoft.appcenter:appcenter-analytics:5.0.1' implementation 'com.microsoft.appcenter:appcenter-analytics:5.0.2'
implementation 'com.microsoft.appcenter:appcenter-crashes:5.0.1' implementation 'com.microsoft.appcenter:appcenter-crashes:5.0.2'
implementation 'com.microsoft.appcenter:appcenter-distribute:5.0.1' implementation 'com.microsoft.appcenter:appcenter-distribute:5.0.2'
} }
if (getProps("APPCENTER_TOKEN") != "") { if (getProps("APPCENTER_TOKEN") != "") {

4
app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
View file

@ -43,7 +43,7 @@ class BoxService(
baseDir.mkdirs() baseDir.mkdirs()
val tempDir = Application.application.cacheDir val tempDir = Application.application.cacheDir
tempDir.mkdirs() tempDir.mkdirs()
Libbox.setup(baseDir.path, tempDir.path) Libbox.setup(baseDir.path, baseDir.path, tempDir.path, false)
Libbox.redirectStderr(File(baseDir, "stderr.log").path) Libbox.redirectStderr(File(baseDir, "stderr.log").path)
initializeOnce = true initializeOnce = true
return return
@ -88,7 +88,7 @@ class BoxService(
private fun startCommandServer() { private fun startCommandServer() {
val commandServer = val commandServer =
CommandServer(Application.application.filesDir.absolutePath, this, 300) CommandServer(this, 300)
commandServer.start() commandServer.start()
this.commandServer = commandServer this.commandServer = commandServer
} }

3
app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt
View file

@ -279,8 +279,7 @@ class DashboardFragment : Fragment(), CommandClientHandler {
return return
} }
runCatching { runCatching {
Libbox.newStandaloneCommandClient(mainActivity.filesDir.absolutePath) Libbox.newStandaloneCommandClient().serviceReload()
.serviceReload()
}.onFailure { }.onFailure {
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
mainActivity.errorDialogBuilder(it).show() mainActivity.errorDialogBuilder(it).show()

8
build.gradle
View file

@ -6,9 +6,9 @@ buildscript {
} }
plugins { plugins {
id 'com.android.application' version '8.0.2' apply false id 'com.android.application' version '8.1.0' apply false
id 'com.android.library' version '8.0.2' apply false id 'com.android.library' version '8.1.0' apply false
id 'org.jetbrains.kotlin.android' version '1.8.21' apply false id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
id 'com.google.devtools.ksp' version '1.8.21-1.0.11' apply false id 'com.google.devtools.ksp' version '1.9.0-1.0.12' apply false
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
#Tue Jun 27 11:41:40 CST 2023 #Tue Jun 27 11:41:40 CST 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists