From 859dc008bc38e6a56fcbaf7d70f95858c57ec9d1 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 12 May 2021 16:11:32 +0530
Subject: [PATCH] Upgrade Gradle and `androidx.annotation` (#1407)

---
 app/build.gradle.kts                        | 2 +-
 autofill-parser/build.gradle.kts            | 2 +-
 buildSrc/src/main/java/BaseProjectConfig.kt | 4 ++--
 format-common/build.gradle.kts              | 2 +-
 gradle/libs.versions.toml                   | 2 +-
 gradle/wrapper/gradle-wrapper.properties    | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e4543813..45303723 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -51,7 +51,7 @@ android {
 
 dependencies {
   kapt(libs.dagger.hilt.compiler)
-  compileOnly(libs.androidx.annotation)
+  implementation(libs.androidx.annotation)
   coreLibraryDesugaring(libs.android.desugarJdkLibs)
   implementation(projects.autofillParser)
   implementation(projects.formatCommon)
diff --git a/autofill-parser/build.gradle.kts b/autofill-parser/build.gradle.kts
index c029b65c..e1550b9d 100644
--- a/autofill-parser/build.gradle.kts
+++ b/autofill-parser/build.gradle.kts
@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-  compileOnly(libs.androidx.annotation)
+  implementation(libs.androidx.annotation)
   implementation(libs.androidx.autofill)
   implementation(libs.kotlin.coroutines.android)
   implementation(libs.kotlin.coroutines.core)
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index 52b41c4f..55ee772e 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -21,9 +21,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
  */
 internal fun Project.configureForRootProject() {
   tasks.withType<Wrapper> {
-    gradleVersion = "7.0"
+    gradleVersion = "7.0.1"
     distributionType = Wrapper.DistributionType.ALL
-    distributionSha256Sum = "81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd"
+    distributionSha256Sum = "ca42877db3519b667cd531c414be517b294b0467059d401e7133f0e55b9bf265"
   }
   configureBinaryCompatibilityValidator()
 }
diff --git a/format-common/build.gradle.kts b/format-common/build.gradle.kts
index 08e2bab6..f387413a 100644
--- a/format-common/build.gradle.kts
+++ b/format-common/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 dependencies {
-  compileOnly(libs.androidx.annotation)
+  implementation(libs.androidx.annotation)
   implementation(libs.dagger.hilt.core)
   implementation(libs.thirdparty.commons.codec)
   implementation(libs.thirdparty.kotlinResult)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 94b4af54..4cc0a5d3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-co
 
 # AndroidX dependencies
 androidx-activityKtx = "androidx.activity:activity-ktx:1.3.0-alpha07"
-androidx-annotation = "androidx.annotation:annotation:1.1.0"
+androidx-annotation = "androidx.annotation:annotation:1.2.0"
 androidx-autofill = "androidx.autofill:autofill:1.2.0-alpha01"
 androidx-appcompat = "androidx.appcompat:appcompat:1.3.0-rc01"
 androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9d174797..099f1006 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=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionSha256Sum=ca42877db3519b667cd531c414be517b294b0467059d401e7133f0e55b9bf265
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists