diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9cc0729ee..8edd4a019 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -24,11 +24,9 @@ android {
         versionCode = Config["appVersionCode"]?.toInt()
         buildConfigField("int", "LATEST_MAGISK", Config["versionCode"] ?: "Integer.MAX_VALUE")
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = mapOf("room.incremental" to "true")
-            }
-        }
+        javaCompileOptions.annotationProcessorOptions.arguments(
+                mapOf("room.incremental" to "true")
+        )
     }
 
     buildTypes {
@@ -86,7 +84,6 @@ dependencies {
     implementation("com.jakewharton.timber:timber:4.7.1")
 
     implementation(kotlin("stdlib"))
-    implementation(kotlin("stdlib-jdk7"))
 
     val vBAdapt = "4.0.0"
     val bindingAdapter = "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter"
diff --git a/app/signing/build.gradle.kts b/app/signing/build.gradle.kts
index df857f536..cb576de28 100644
--- a/app/signing/build.gradle.kts
+++ b/app/signing/build.gradle.kts
@@ -18,9 +18,9 @@ val jar by tasks.getting(Jar::class) {
 }
 
 val shadowJar by tasks.getting(ShadowJar::class) {
-    baseName = "zipsigner"
-    classifier = null
-    version = "4.0"
+    archiveBaseName.set("zipsigner")
+    archiveClassifier.set(null as String?)
+    archiveVersion.set("4.0")
 }
 
 repositories {
diff --git a/build.gradle.kts b/build.gradle.kts
index 9f05fbf14..8fe9b99c7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,6 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url = uri("http://storage.googleapis.com/r8-releases/raw") }
         maven { url = uri("https://kotlin.bintray.com/kotlinx") }
     }
 
@@ -95,7 +94,7 @@ subprojects {
                 signingConfigs {
                     create("config") {
                         Config["keyStore"]?.also {
-                            storeFile = File(it)
+                            storeFile = rootProject.file(it)
                             storePassword = Config["keyStorePass"]
                             keyAlias = Config["keyAlias"]
                             keyPassword = Config["keyPass"]
diff --git a/stub/build.gradle.kts b/stub/build.gradle.kts
index bd749bd35..c0077060f 100644
--- a/stub/build.gradle.kts
+++ b/stub/build.gradle.kts
@@ -20,6 +20,11 @@ android {
             )
         }
     }
+
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }
 }
 
 dependencies {