From da37723ef86d49e1fbaeb8e22c1ea7c6e199d814 Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Mon, 24 Feb 2020 22:26:14 -0500
Subject: [PATCH 1/3] Bump Gradle to 6.2.1

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew.bat                              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b7c8c5dbf..4a6ebceac 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d96..62bd9b9cc 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

From 3409d603d43ab59f5051ed96a5934b812a1e9d7d Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Mon, 24 Feb 2020 22:27:12 -0500
Subject: [PATCH 2/3] Bump AGP to 3.6.0 final

---
 buildSrc/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index f099c78d4..a3909b26a 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,4 +15,4 @@ dependencies {
 
 kotlinDslPluginOptions {
     experimentalWarning.set(false)
-}
\ No newline at end of file
+}

From 812a540b3545acef8617a6ee7fd89569c43c42d5 Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Mon, 24 Feb 2020 22:33:37 -0500
Subject: [PATCH 3/3] Bump AGP to 3.6.0 final

---
 buildSrc/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index a3909b26a..0f2d5d462 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -10,9 +10,9 @@ plugins {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.1")
-    implementation("com.android.tools.build:gradle:3.6.0-rc03")
+    implementation("com.android.tools.build:gradle:3.6.0")
 }
 
 kotlinDslPluginOptions {
     experimentalWarning.set(false)
-}
+}
\ No newline at end of file