diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..4ce4a9be35
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,5 @@
+root = true
+
+
+[*{kt,kts}]
+disabled_rules=no-wildcard-imports
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c335d90c7a..3b9caa5038 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,10 @@ buildscript {
             }
         }
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
+        maven { url "https://dl.bintray.com/kotlin/kotlinx" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
 
@@ -59,7 +60,7 @@ buildscript {
 }
 
 plugins {
-    id "io.gitlab.arturbosch.detekt" version "1.15.0-RC2"
+    id "io.gitlab.arturbosch.detekt" version "1.16.0-RC2"
     id "org.jlleitschuh.gradle.ktlint" version "9.4.1"
 }
 
@@ -83,6 +84,8 @@ allprojects {
                 includeModule("org.jetbrains.trove4j", "trove4j")
             }
         }
+        maven { url "https://dl.bintray.com/kotlin/kotlinx" }
+
     }
     //Support @JvmDefault
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4d9e76064..e53b7051f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip