diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5ab4dcde7..d425c4ddb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,7 +4,6 @@ import java.util.Properties
 plugins {
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.room)
@@ -32,12 +31,6 @@ android {
     compileSdk = 37
     namespace = "io.legado.app"
 
-    kotlin {
-        jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(21))
-        }
-    }
-
     signingConfigs {
         if (project.hasProperty("RELEASE_STORE_FILE")) {
             create("myConfig") {
@@ -139,31 +132,6 @@ android {
         }
     }
 
-    applicationVariants.all {
-        val variant = this
-        outputs.all {
-            val output = this as com.android.build.gradle.internal.api.BaseVariantOutputImpl
-            val abi = output.getFilter(com.android.build.OutputFile.ABI)
-            val flavor = variant.productFlavors[0].name
-            val baseVersionName = variant.versionName
-            var apkName = "${appName}_${flavor}_${baseVersionName}"
-            if (abi != null) {
-                apkName += "_$abi"
-            }
-            output.outputFileName = "$apkName.apk"
-        }
-    }
-
-    room {
-        schemaDirectory("$projectDir/schemas")
-    }
-
-    ksp {
-        arg("room.incremental", "true")
-        arg("room.expandProjection", "true")
-        arg("room.generateKotlin", "false")
-    }
-
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_21
@@ -175,7 +143,7 @@ android {
     }
 
     sourceSets {
-        getByName("androidTest").assets.srcDirs("$projectDir/schemas")
+        getByName("androidTest").assets.directories.add("$projectDir/schemas")
     }
 
     lint {
@@ -183,6 +151,22 @@ android {
     }
 }
 
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+room {
+    schemaDirectory("$projectDir/schemas")
+}
+
+ksp {
+    arg("room.incremental", "true")
+    arg("room.expandProjection", "true")
+    arg("room.generateKotlin", "false")
+}
+
 dependencies {
     coreLibraryDesugaring(libs.desugar)
     testImplementation(libs.junit)
diff --git a/build.gradle.kts b/build.gradle.kts
index ca6a55bf9..c7b6e7913 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.ksp) apply false
@@ -20,4 +19,4 @@ plugins {
 
 tasks.register<Delete>("clean") {
     delete(rootProject.layout.buildDirectory)
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index 8bc360dce..92ba8a170 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -41,14 +41,9 @@ CronetMainVersion=128.0.0.0
 android.injected.testOnly=false
 android.nonFinalResIds=true
 android.injected.androidTest.leaveApksInstalledAfterRun=true
-android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
-android.enableAppCompileTimeRClass=false
-android.usesSdkInManifest.disallowed=false
 android.uniquePackageNames=false
 android.dependency.useConstraints=true
+android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
 android.r8.strictFullModeForKeepRules=false
-android.r8.optimizedResourceShrinking=false
-android.builtInKotlin=false
-android.newDsl=false
 
 
diff --git a/modules/book/build.gradle.kts b/modules/book/build.gradle.kts
index 9986e5f36..29288a97c 100644
--- a/modules/book/build.gradle.kts
+++ b/modules/book/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
diff --git a/modules/rhino/build.gradle.kts b/modules/rhino/build.gradle.kts
index 3ed7d0b64..d8452c7a5 100644
--- a/modules/rhino/build.gradle.kts
+++ b/modules/rhino/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -23,10 +22,10 @@ android {
     }
     lint {
         checkDependencies = true
-        targetSdk = 36
+        targetSdk = 37
     }
     testOptions {
-        targetSdk = 36
+        targetSdk = 37
     }
     tasks.withType<JavaCompile>().configureEach {
         options.compilerArgs.add("-Xlint:deprecation")