From 7afff19fcec34703137d5455cd36cab719d0d7ad Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 14 Feb 2021 17:33:30 +0530
Subject: [PATCH 1/2] build: update AGP

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 buildSrc/src/main/java/BaseProjectConfig.kt | 20 +++++++++++---------
 buildSrc/src/main/java/Dependencies.kt      |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index f298d778..e2731179 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -38,7 +38,7 @@ internal fun Project.configureForAllProjects() {
   repositories {
     google()
     mavenCentral()
-    jcenter() {
+    jcenter {
       content {
         // Indirect dependencies
         // https://youtrack.jetbrains.com/issue/IDEA-261387
@@ -102,14 +102,16 @@ internal fun TestedExtension.configureCommonAndroidOptions() {
     targetSdkVersion(30)
   }
 
-  packagingOptions {
-    exclude("**/*.version")
-    exclude("**/*.txt")
-    exclude("**/*.kotlin_module")
-    exclude("**/plugin.properties")
-    exclude("META-INF/AL2.0")
-    exclude("META-INF/LGPL2.1")
-  }
+  packagingOptions.resources.excludes.addAll(
+    setOf(
+      "**/*.version",
+      "**/*.txt",
+      "**/*.kotlin_module",
+      "**/plugin.properties",
+      "META-INF/AL2.0",
+      "META-INF/LGPL2.1"
+    )
+  )
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_11
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index b25d0c2b..d93e124c 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -6,8 +6,8 @@
 private const val DAGGER_HILT_VERSION = "2.32-alpha"
 
 object Plugins {
-  const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha05"
-  const val androidGradlePlugin_lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha05"
+  const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha06"
+  const val androidGradlePlugin_lintModel = "com.android.tools.lint:lint-model:30.0.0-alpha06"
   const val daggerGradlePlugin =
     "com.google.dagger:hilt-android-gradle-plugin:${DAGGER_HILT_VERSION}"
   const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"

From 9bf7a97e5539c38145ac3d05d6d898a9ffeea427 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 14 Feb 2021 17:47:02 +0530
Subject: [PATCH 2/2] buildSrc: codestyle fixups

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .editorconfig                              | 23 ----------------------
 .idea/codeStyles/Project.xml               | 12 +++++++----
 buildSrc/src/main/java/SigningConfig.kt    |  2 +-
 buildSrc/src/main/java/VersioningPlugin.kt |  2 +-
 4 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 2dc435e1..00000000
--- a/.editorconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-# https://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.{java,kt,kts,xml}]
-indent_size = 2
-ij_continuation_indent_size = 2
-
-[*.{kt,kts}]
-kotlin_imports_layout=ascii
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
-ij_kotlin_field_annotation_wrap = normal
-
-[*.md]
-trim_trailing_whitespace = false
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 41f6387c..1546dc76 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,10 +3,12 @@
     <option name="LINE_SEPARATOR" value="&#10;" />
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="false" />
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="100" />
@@ -16,7 +18,9 @@
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
       </indentOptions>
       <arrangement>
         <rules>
diff --git a/buildSrc/src/main/java/SigningConfig.kt b/buildSrc/src/main/java/SigningConfig.kt
index 74979f72..7fb7b8b8 100644
--- a/buildSrc/src/main/java/SigningConfig.kt
+++ b/buildSrc/src/main/java/SigningConfig.kt
@@ -4,7 +4,7 @@
  */
 
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import java.util.*
+import java.util.Properties
 import org.gradle.api.Project
 
 private const val KEYSTORE_CONFIG_PATH = "keystore.properties"
diff --git a/buildSrc/src/main/java/VersioningPlugin.kt b/buildSrc/src/main/java/VersioningPlugin.kt
index cbf0ea69..27e1707e 100644
--- a/buildSrc/src/main/java/VersioningPlugin.kt
+++ b/buildSrc/src/main/java/VersioningPlugin.kt
@@ -7,7 +7,7 @@
 import com.android.build.gradle.internal.plugins.AppPlugin
 import com.github.zafarkhaja.semver.Version
 import java.io.OutputStream
-import java.util.*
+import java.util.Properties
 import org.gradle.api.Plugin
 import org.gradle.api.Project