Merge branch 'bump-gradle-plugin'

3 files changed, 9 insertions, 8 deletions

diff --git a/android/.idea/modules/android.iml b/android/.idea/modules/android.iml
index 5d032106a0..40d7ad90fc 100644
--- a/android/.idea/modules/android.iml
+++ b/android/.idea/modules/android.iml
@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.6.0" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.6.0" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.1.2" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="4.1.2" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
@@ -19,8 +19,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../src/main/res;file://$MODULE_DIR$/../../src/debug/res;file://$MODULE_DIR$/../../build/generated/res/rs/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../src/androidTest/res;file://$MODULE_DIR$/../../src/androidTestDebug/res;file://$MODULE_DIR$/../../build/generated/res/rs/androidTest/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../src/main/res;file://$MODULE_DIR$/../../src/debug/res;file://$MODULE_DIR$/../../build/generated/res/rs/debug;file://$MODULE_DIR$/../../build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../src/androidTest/res;file://$MODULE_DIR$/../../src/androidTestDebug/res;file://$MODULE_DIR$/../../build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../build/generated/res/resValues/androidTest/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/build/extraAssets" />
       </configuration>
     </facet>
@@ -31,7 +31,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/2c6db3db3fce28dc9741e81f634883bc/material-1.2.1-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/c984a79bba9d355ff47b0092abe2bae2/appcompat-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/ed1553fa3f354b6f2fb744008effe300/jetified-viewpager2-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/3e6c32804e74519738439fa69a6da541/recyclerview-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/0b805fd125b14aaa952d6bd515bcba89/fragment-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/d4c859afceda3b2aeff55f3ce9259cd6/jetified-appcompat-resources-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/871216028175f46f2f63b9f7221a0418/drawerlayout-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/4daa0a572f7703fa25e2cef8bd6d93a2/coordinatorlayout-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/114f3636978f03934c44f1e01c155835/viewpager-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/27d106a84ac8db1a229759b11adf4e0a/customview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/781021d445036b91d3502e2ec5e7fc78/transition-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/43e686f054162f512249c2d11a7705fe/vectordrawable-animated-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/62a68cffee166159737266a398268e32/vectordrawable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/211261877f036f70ab7043b14cc94d67/loader-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/97b1b6f22d2508bf19e80bdebd5d00e6/jetified-activity-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/dc25dafbd92e8a0ce10d85d8b3bb09c7/core-1.3.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/f70b7893a2942ef9f931806bd6648c0a/cursoradapter-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/6996984890ede67a37409f7a29e95f25/versionedparcelable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/a35ea332117e719bee10684040436649/cardview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/5f6f32f25c8f33f462a180f26eda5374/lifecycle-runtime-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/4efc73e28a881e1b9d528d1639822af3/lifecycle-viewmodel-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/aa8925ce74054233b5296b3ce401398b/jetified-savedstate-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/4ae38170a63c8ef068d11787fa92905a/lifecycle-livedata-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/b8abe10c75d9ae18fcb55cbacd57da46/lifecycle-livedata-core-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/bb7ce1440f3ca7503c52c9d15edee74f/core-runtime-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/ece404db03183a2badbeb504453455ad/interpolator-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/a1a54bd90632beb2820625cd70f67b89/jetified-annotation-experimental-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/ab1b6f6ae2c7e93a1473d206c5589009/jetified-commons-validator-1.7.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/661b19480f85bdca98f2cc1865434b8b/jetified-commons-beanutils-1.9.4.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/2fd3dbfc4c3338686a34dec4df48014e/jetified-commons-logging-1.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/62edf39f561884f9387100dc7d626df7/jetified-commons-collections-3.2.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/0fbad796a56b19f64b105972e5145ee5/jetified-commons-digester-2.1.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/b1c7f98e242b84b284cbaf428ff0f4de/jetified-joda-time-2.10.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/aa302c8f52f51c6be109438ef5e096ea/jetified-kotlinx-coroutines-android-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/b8d9d1d9d83f1e9efd36ffe011043dc0/jetified-kotlinx-coroutines-core-jvm-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/1e2e5d334ccb46d235082a09c43857ec/jetified-kotlin-stdlib-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/5de51ab0c33e3315f87021699c8a6839/jetified-kotlin-stdlib-common-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/fd06d0e199a6ee0606db09c58b1e846c/jetified-annotations-13.0.jar:/Users/aleksandrgranin/Library/Android/sdk/platforms/android-29/android.jar:/Users/aleksandrgranin/Library/Android/sdk/build-tools/29.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/5564e21ca78dd9fcee25669a18ec46fc/material-1.2.1-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/c6dba395b39ae60d0b64f9859d4d14e7/appcompat-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/47c8638a26572d48a70e74dd8429455a/jetified-viewpager2-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/dcc35aef0d56e2deed08a3d93c779029/recyclerview-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/e4ae9586f12aed62661d019828be3b85/fragment-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/a3fe9d248ef861c66d2b143f212f7c6c/jetified-appcompat-resources-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/95e09ad0dc3836788097726f40ea29aa/drawerlayout-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/fce13c7257385746e294baf89005c72a/coordinatorlayout-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/7c99cbd33c7bebbfd13b3f30a08b5657/viewpager-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/240de28e925eb0a9a86cb995a8701721/customview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/9e6b134d6f7d8057318be9df7947bc22/transition-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/f7566fec3124c60c310004bc0177598e/vectordrawable-animated-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/207a08f434b021048a49b2b0c64eaf90/vectordrawable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/1055c050b93f211dab8d7c18e5b2495b/loader-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/757dd1942480ac492133be4966c1650f/jetified-activity-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/c0b1e6770811228c1315aaba4e2ffe47/core-1.3.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/5c115b91931650400984c74d4d99cc90/cursoradapter-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/ccdb1909d710dcf774a1ec8ad93baf42/versionedparcelable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/0ac30cbae7e71bdbd89eaa556640faf3/cardview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/8f079d79c5cb9d8009006c3b84779ef0/lifecycle-runtime-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/0aa1977f62603b02946e188d5e433843/lifecycle-viewmodel-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/abe820ad568b41b2bef08d37091aa7ec/jetified-savedstate-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/bbcab19646c030539b44bcab889521c5/lifecycle-livedata-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/2f2ef161da37b6092e7702a4c52959db/lifecycle-livedata-core-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/920333431c4c0ca4b73d5e47e973e483/core-runtime-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/00bac86cd7b725fe6ccd046fb9c2bc5d/interpolator-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/84bd64cdb1248222f50650b2d10dcc20/jetified-annotation-experimental-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/2cfca2db1f1c374607b8948df49f5e9e/jetified-commons-validator-1.7.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/1b75ca76ff267a6010352d134b8f87a4/jetified-commons-beanutils-1.9.4.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/052f550d4a0c65a0d87a79f0961fec0b/jetified-commons-logging-1.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/1badcf71d3dda9b8167362628b2bbf0c/jetified-commons-collections-3.2.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/5f4141f39976d201be8dcecb11ecbd98/jetified-commons-digester-2.1.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/fe534f91e4d4bd14e465d771d89232ca/jetified-joda-time-2.10.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/8faeecc38c97667dcbc9da48dd8b2db2/jetified-kotlinx-coroutines-android-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/54d6d0be8cfd548514c298e1a96e1514/jetified-kotlinx-coroutines-core-jvm-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/ced1359422368169f6e97fb698b0a0d1/jetified-kotlin-stdlib-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/c62b5a4b3b40490a670fdc7b19375a02/jetified-kotlin-stdlib-common-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-2/files-2.1/d8ae92b2cde1fe8fd7fad34031400c9e/jetified-annotations-13.0.jar:/Users/aleksandrgranin/Library/Android/sdk/platforms/android-29/android.jar:/Users/aleksandrgranin/Library/Android/sdk/build-tools/29.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="android_debug" />
@@ -60,6 +60,7 @@
       <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../build/extraAssets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/res/resValues/debug" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
     </content>
@@ -108,4 +109,4 @@
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/android/build.gradle b/android/build.gradle
index dc6a725206..e38de370a1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -118,7 +118,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'com.github.triplet.gradle:play-publisher:2.7.5'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10'
     }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index d504df910a..9fccb7a76d 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip