Update to Gradle 7.0 (#1381)

1 files changed, 42 insertions, 49 deletions

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 401b29a5..5901b7f3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -42,64 +42,57 @@ android {
 }
 
 dependencies {
-  compileOnly(Dependencies.AndroidX.annotation)
-  implementation(project(":autofill-parser"))
-  implementation(project(":openpgp-ktx"))
-  implementation(Dependencies.AndroidX.activity_ktx)
-  implementation(Dependencies.AndroidX.appcompat)
-  implementation(Dependencies.AndroidX.autofill)
-  implementation(Dependencies.AndroidX.biometric_ktx)
-  implementation(Dependencies.AndroidX.constraint_layout)
-  implementation(Dependencies.AndroidX.core_ktx)
-  implementation(Dependencies.AndroidX.documentfile)
-  implementation(Dependencies.AndroidX.fragment_ktx)
-  implementation(Dependencies.AndroidX.lifecycle_common)
-  implementation(Dependencies.AndroidX.lifecycle_livedata_ktx)
-  implementation(Dependencies.AndroidX.lifecycle_viewmodel_ktx)
-  implementation(Dependencies.AndroidX.material)
-  implementation(Dependencies.AndroidX.preference)
-  implementation(Dependencies.AndroidX.recycler_view)
-  implementation(Dependencies.AndroidX.recycler_view_selection)
-  implementation(Dependencies.AndroidX.security)
-  implementation(Dependencies.AndroidX.swiperefreshlayout)
+  compileOnly(libs.androidx.annotation)
+  implementation(projects.autofillParser)
+  implementation(projects.openpgpKtx)
+  implementation(libs.androidx.activityKtx)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.autofill)
+  implementation(libs.androidx.biometricKtx)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.coreKtx)
+  implementation(libs.androidx.documentfile)
+  implementation(libs.androidx.fragmentKtx)
+  implementation(libs.bundles.androidxLifecycle)
+  implementation(libs.androidx.material)
+  implementation(libs.androidx.preference)
+  implementation(libs.androidx.recyclerview)
+  implementation(libs.androidx.recyclerviewSelection)
+  implementation(libs.androidx.security)
+  implementation(libs.androidx.swiperefreshlayout)
 
-  implementation(Dependencies.Kotlin.Coroutines.android)
-  implementation(Dependencies.Kotlin.Coroutines.core)
+  implementation(libs.kotlin.coroutines.android)
+  implementation(libs.kotlin.coroutines.core)
 
-  implementation(Dependencies.FirstParty.sublime_fuzzy)
-  implementation(Dependencies.FirstParty.zxing_android_embedded)
+  implementation(libs.aps.sublimeFuzzy)
+  implementation(libs.aps.zxingAndroidEmbedded)
 
-  implementation(Dependencies.ThirdParty.bouncycastle)
-  implementation(Dependencies.ThirdParty.commons_codec)
-  implementation(Dependencies.ThirdParty.eddsa)
-  implementation(Dependencies.ThirdParty.fastscroll)
-  implementation(Dependencies.ThirdParty.jgit) {
+  implementation(libs.thirdparty.bouncycastle)
+  implementation(libs.thirdparty.commons.codec)
+  implementation(libs.thirdparty.eddsa)
+  implementation(libs.thirdparty.fastscroll)
+  implementation(libs.thirdparty.jgit) {
     exclude(group = "org.apache.httpcomponents", module = "httpclient")
   }
-  implementation(Dependencies.ThirdParty.kotlin_result)
-  implementation(Dependencies.ThirdParty.modern_android_prefs)
-  implementation(Dependencies.ThirdParty.plumber)
-  implementation(Dependencies.ThirdParty.ssh_auth)
-  implementation(Dependencies.ThirdParty.sshj)
-  implementation(Dependencies.ThirdParty.timber)
-  implementation(Dependencies.ThirdParty.timberkt)
+  implementation(libs.thirdparty.kotlinResult)
+  implementation(libs.thirdparty.modernAndroidPrefs)
+  implementation(libs.thirdparty.plumber)
+  implementation(libs.thirdparty.sshauth)
+  implementation(libs.thirdparty.sshj)
+  implementation(libs.thirdparty.timber)
+  implementation(libs.thirdparty.timberkt)
 
   if (isSnapshot()) {
-    implementation(Dependencies.ThirdParty.leakcanary)
-    implementation(Dependencies.ThirdParty.whatthestack)
+    implementation(libs.thirdparty.leakcanary)
+    implementation(libs.thirdparty.whatthestack)
   } else {
-    debugImplementation(Dependencies.ThirdParty.leakcanary)
-    debugImplementation(Dependencies.ThirdParty.whatthestack)
+    debugImplementation(libs.thirdparty.leakcanary)
+    debugImplementation(libs.thirdparty.whatthestack)
   }
 
-  "nonFreeImplementation"(Dependencies.NonFree.google_play_auth_api_phone)
+  "nonFreeImplementation"(libs.thirdparty.nonfree.googlePlayAuthApiPhone)
 
-  // Testing-only dependencies
-  androidTestImplementation(Dependencies.Testing.junit)
-  androidTestImplementation(Dependencies.Testing.kotlin_test_junit)
-  androidTestImplementation(Dependencies.Testing.AndroidX.runner)
-  androidTestImplementation(Dependencies.Testing.AndroidX.rules)
-
-  testImplementation(Dependencies.Testing.junit)
-  testImplementation(Dependencies.Testing.kotlin_test_junit)
+  androidTestImplementation(libs.bundles.testDependencies)
+  androidTestImplementation(libs.bundles.androidTestDependencies)
+  testImplementation(libs.bundles.testDependencies)
 }