From 2e3950d997aaba5f4737b64dad617b1329444afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sun, 30 Jul 2023 15:51:13 +0800 Subject: [PATCH] Update dependencies --- app/build.gradle | 10 +++++----- app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt | 4 ++-- .../io/nekohasekai/sfa/ui/main/DashboardFragment.kt | 3 +-- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f281604..e39187b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { defaultConfig { applicationId "io.nekohasekai.sfa" minSdk 21 - targetSdk 33 + targetSdk 34 versionCode getProps("VERSION_CODE").toInteger() versionName getProps("VERSION_NAME") setProperty("archivesBaseName", "SFA-" + versionName) @@ -89,15 +89,15 @@ dependencies { ksp 'androidx.room:room-compiler:2.5.2' implementation 'androidx.work:work-runtime-ktx:2.8.1' 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) implementation 'com.blacksquircle.ui:editorkit: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-crashes:5.0.1' - implementation 'com.microsoft.appcenter:appcenter-distribute:5.0.1' + implementation 'com.microsoft.appcenter:appcenter-analytics:5.0.2' + implementation 'com.microsoft.appcenter:appcenter-crashes:5.0.2' + implementation 'com.microsoft.appcenter:appcenter-distribute:5.0.2' } if (getProps("APPCENTER_TOKEN") != "") { diff --git a/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt b/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt index 1534267..d1d79e6 100644 --- a/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt +++ b/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt @@ -43,7 +43,7 @@ class BoxService( baseDir.mkdirs() val tempDir = Application.application.cacheDir tempDir.mkdirs() - Libbox.setup(baseDir.path, tempDir.path) + Libbox.setup(baseDir.path, baseDir.path, tempDir.path, false) Libbox.redirectStderr(File(baseDir, "stderr.log").path) initializeOnce = true return @@ -88,7 +88,7 @@ class BoxService( private fun startCommandServer() { val commandServer = - CommandServer(Application.application.filesDir.absolutePath, this, 300) + CommandServer(this, 300) commandServer.start() this.commandServer = commandServer } diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt b/app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt index 7dc312a..8b7c60b 100644 --- a/app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt +++ b/app/src/main/java/io/nekohasekai/sfa/ui/main/DashboardFragment.kt @@ -279,8 +279,7 @@ class DashboardFragment : Fragment(), CommandClientHandler { return } runCatching { - Libbox.newStandaloneCommandClient(mainActivity.filesDir.absolutePath) - .serviceReload() + Libbox.newStandaloneCommandClient().serviceReload() }.onFailure { withContext(Dispatchers.Main) { mainActivity.errorDialogBuilder(it).show() diff --git a/build.gradle b/build.gradle index be5b7cf..d5db01f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { } plugins { - id 'com.android.application' version '8.0.2' apply false - id 'com.android.library' version '8.0.2' apply false - id 'org.jetbrains.kotlin.android' version '1.8.21' apply false - id 'com.google.devtools.ksp' version '1.8.21-1.0.11' apply false + id 'com.android.application' version '8.1.0' apply false + id 'com.android.library' version '8.1.0' apply false + id 'org.jetbrains.kotlin.android' version '1.9.0' apply false + id 'com.google.devtools.ksp' version '1.9.0-1.0.12' apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5bff7d5..1487148 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ #Tue Jun 27 11:41:40 CST 2023 distributionBase=GRADLE_USER_HOME 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 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists