代码优化

kkevsekk1 · Oct 11, 2023 · 6703c2d · 6703c2d
1 parent 9cfeb00
commit 6703c2d
Show file tree

Hide file tree

Showing 12 changed files with 282 additions and 334 deletions.
diff --git a/_config.yml b/_config.yml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -192,7 +192,7 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1-alpha01") {
         exclude(group = "com.android.support", module = "support-annotations")
     }
-    testImplementation("junit:junit:4.13.2")
+    testImplementation(libs.junit)
     // Kotlin携程
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2")
     // Android Annotations
@@ -299,14 +299,7 @@ dependencies {
     implementation("androidx.savedstate:savedstate-ktx:1.2.0")
     implementation("androidx.savedstate:savedstate:1.2.0")
 
-    val ktor_version = "2.0.3"
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-server-netty:$ktor_version")
-    implementation("io.ktor:ktor-server-websockets:$ktor_version")
-    implementation("io.ktor:ktor-client-websockets:$ktor_version")
-    implementation("io.ktor:ktor-client-okhttp:$ktor_version")
-    implementation("io.ktor:ktor-client-core:$ktor_version")
-
+    implementation(libs.bundles.ktor)
     //qr scan
     implementation("io.github.g00fy2.quickie:quickie-bundled:1.5.0")
     //Fab button with menu, please do not upgrade, download dependencies will be error after upgrade

diff --git a/autojs/build.gradle.kts b/autojs/build.gradle.kts
@@ -33,8 +33,8 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1-alpha01"){
         exclude(group = "com.android.support",module = "support-annotations")
     }
-    testImplementation("junit:junit:4.13.2")
-    implementation("androidx.documentfile:documentfile:1.0.1")
+    testImplementation(libs.junit)
+    implementation(libs.documentfile)
     implementation("androidx.preference:preference-ktx:1.2.0")
     api("org.greenrobot:eventbus:3.3.1")
     api("net.lingala.zip4j:zip4j:1.3.2")
@@ -45,7 +45,7 @@ dependencies {
     api("com.github.hyb1996:EnhancedFloaty:0.31")
     api("com.makeramen:roundedimageview:2.3.0")
     // OkHttp
-    api("com.squareup.okhttp3:okhttp:4.10.0")
+    api(libs.okhttp)
     // JDeferred
     api("org.jdeferred:jdeferred-android-aar:1.2.6")
     // RootShell

diff --git a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java b/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java