resolve conflicts

bendikv · Oct 22, 2020 · 234e358 · 234e358
1 parent 14619ba
commit 234e358
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,11 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
  ext {
- gradleVersion = '4.0.1'
+ gradleVersion = '4.1.0'
  kotlinVersion = "1.4.10"
- junitVersion = "4.13"
+ junitVersion = "4.13.1"
  espressoVersion = "3.3.0"
- coreVersion = "1.3.1"
- constraintlayoutVersion = "2.0.1"
+ coreVersion = "1.3.2"
+ constraintlayoutVersion = "2.0.2"
  materialVersion = "1.2.1"
  glideVersion = "4.11.0"
  exoPlayerVersion = "2.11.7"

diff --git 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.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip