Uprev Gradle and dependencies (#1007)

* build: uprev Gradle

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* build: uprev dependencies

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* app/proguard: remove Tink rules

I'm assuming the R8 problems fixed by the Tink upgrade cover this as well

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

7 files changed, 17 insertions, 36 deletions

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8e53f558..3ffa9d7c 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -28,10 +28,6 @@
 -keep class org.bouncycastle.jce.provider.** { *; }
 -keep class !org.bouncycastle.jce.provider.X509LDAPCertStoreSpi { *; }
 
-# Tink (for security-crypto)
-# I'm most certainly not a fan of this catch-all rule
--keep class com.google.crypto.tink.proto.** { *; }
-
 # WhatTheStack
 -keep class com.haroldadmin.whatthestack.WhatTheStackInitializer {
   <init>();
diff --git a/build.gradle.kts b/build.gradle.kts
index b4821208..ac356d2b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@ buildscript {
 
 plugins {
     id("com.github.ben-manes.versions") version "0.29.0"
-    id("com.autonomousapps.dependency-analysis") version "0.53.0"
+    id("com.autonomousapps.dependency-analysis") version "0.56.0"
 }
 
 subprojects {
@@ -60,7 +60,7 @@ subprojects {
 }
 
 tasks.wrapper {
-    gradleVersion = "6.5.1"
+    gradleVersion = "6.6"
     distributionType = Wrapper.DistributionType.ALL
-    distributionSha256Sum = "143a28f54f1ae93ef4f72d862dbc3c438050d81bb45b4601eb7076e998362920"
+    distributionSha256Sum = "83fa7c3e5ab84c3c5c4a04fb16947338209efa9aab1f6bf09a5d0e3d2ed87742"
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 63d267db..08e4eae2 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -25,18 +25,18 @@ object Dependencies {
         const val autofill = "androidx.autofill:autofill:1.1.0-alpha01"
         const val appcompat = "androidx.appcompat:appcompat:1.3.0-alpha01"
         const val biometric = "androidx.biometric:biometric:1.1.0-alpha01"
-        const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.0.0-beta8"
+        const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.0.0-rc1"
         const val core_ktx = "androidx.core:core-ktx:1.5.0-alpha01"
         const val documentfile = "androidx.documentfile:documentfile:1.0.1"
         const val fragment_ktx = "androidx.fragment:fragment-ktx:1.3.0-alpha07"
         const val lifecycle_common = "androidx.lifecycle:lifecycle-common-java8:2.3.0-alpha06"
         const val lifecycle_livedata_ktx = "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha06"
         const val lifecycle_viewmodel_ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha06"
-        const val material = "com.google.android.material:material:1.3.0-alpha01"
+        const val material = "com.google.android.material:material:1.3.0-alpha02"
         const val preference = "androidx.preference:preference:1.1.1"
         const val recycler_view = "androidx.recyclerview:recyclerview:1.2.0-alpha05"
         const val recycler_view_selection = "androidx.recyclerview:recyclerview-selection:1.1.0-rc01"
-        const val security = "androidx.security:security-crypto:1.1.0-alpha01"
+        const val security = "androidx.security:security-crypto:1.1.0-alpha02"
         const val swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
     }
 
@@ -74,11 +74,11 @@ object Dependencies {
 
         object AndroidX {
 
-            const val runner = "androidx.test:runner:1.3.0-rc01"
-            const val rules = "androidx.test:rules:1.3.0-rc01"
-            const val junit = "androidx.test.ext:junit:1.1.2-rc01"
-            const val espresso_core = "androidx.test.espresso:espresso-core:3.3.0-rc01"
-            const val espresso_intents = "androidx.test.espresso:espresso-intents:3.3.0-rc01"
+            const val runner = "androidx.test:runner:1.3.0-rc03"
+            const val rules = "androidx.test:rules:1.3.0-rc03"
+            const val junit = "androidx.test.ext:junit:1.1.2-rc03"
+            const val espresso_core = "androidx.test.espresso:espresso-core:3.3.0-rc03"
+            const val espresso_intents = "androidx.test.espresso:espresso-intents:3.3.0-rc03"
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c053..e708b1c0 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 28b21a0c..f927a7d4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=143a28f54f1ae93ef4f72d862dbc3c438050d81bb45b4601eb7076e998362920
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionSha256Sum=83fa7c3e5ab84c3c5c4a04fb16947338209efa9aab1f6bf09a5d0e3d2ed87742
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c515..4f906e0c 100755
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index a9f778a7..ac1b06f9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 

 set JAVA_EXE=java.exe

 %JAVA_EXE% -version >NUL 2>&1

-if "%ERRORLEVEL%" == "0" goto init

+if "%ERRORLEVEL%" == "0" goto execute

 

 echo.

 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%

 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 

-if exist "%JAVA_EXE%" goto init

+if exist "%JAVA_EXE%" goto execute

 

 echo.

 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

@@ -64,21 +64,6 @@ echo location of your Java installation.
 

 goto fail

 

-:init

-@rem Get command-line arguments, handling Windows variants

-

-if not "%OS%" == "Windows_NT" goto win9xME_args

-

-:win9xME_args

-@rem Slurp the command line arguments.

-set CMD_LINE_ARGS=

-set _SKIP=2

-

-:win9xME_args_slurp

-if "x%~1" == "x" goto execute

-

-set CMD_LINE_ARGS=%*

-

 :execute

 @rem Setup the command line

 

@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 

 

 @rem Execute Gradle

-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 

 :end

 @rem End local scope for the variables with windows NT shell