diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/module/Repo.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/module/Repo.kt
index 3e70beb45..3bb4ee096 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/module/Repo.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/module/Repo.kt
@@ -27,10 +27,9 @@ data class Repo(
 
     val lastUpdate get() = Date(last_update)
 
-    val lastUpdateString: String get() =
-        DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(lastUpdate)
+    val lastUpdateString: String get() = dateFormat.format(lastUpdate)
 
-    val downloadFilename: String get() = "$name-$version.zip".legalFilename()
+    val downloadFilename: String get() = "$name-$version($versionCode).zip".legalFilename()
 
     val readme get() = stringRepo.getReadme(this)
 
@@ -65,4 +64,8 @@ data class Repo(
     }
 
     class IllegalRepoException(message: String) : Exception(message)
-}
\ No newline at end of file
+
+    companion object {
+        val dateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)!!
+    }
+}
diff --git a/build.gradle b/build.gradle
index 8c6062775..531d7a4aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         maven { url 'https://kotlin.bintray.com/kotlinx' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0-rc02'
+        classpath 'com.android.tools.build:gradle:3.5.0-rc03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
 
 
@@ -44,7 +44,7 @@ subprojects {
             getPlugins().hasPlugin('com.android.application')) {
             android {
                 compileSdkVersion 29
-                buildToolsVersion '29.0.1'
+                buildToolsVersion '29.0.2'
 
                 defaultConfig {
                     if (minSdkVersion == null)