Update to Gradle 7.0 (#1381)

2 files changed, 76 insertions, 7 deletions

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..28198ae7
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,74 @@
+# Centralized versions for dependencies that share versions
+[versions]
+androidx_test = "1.4.0-alpha05"
+coroutines = "1.4.3"
+kotlin = "1.4.32"
+lifecycle = "2.4.0-alpha01"
+
+[libraries]
+# buildSrc dependencies
+androidGradlePlugin = "com.android.tools.build:gradle:4.1.3"
+binaryCompatibilityValidator = "org.jetbrains.kotlinx:binary-compatibility-validator:0.2.4"
+dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
+downloadTaskPlugin = "de.undercouch:gradle-download-task:4.1.1"
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+ktfmtGradlePlugin = "com.ncorti.ktfmt.gradle:plugin:0.5.0"
+mavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.13.0"
+semver4j = "com.vdurmont:semver4j:3.1.0"
+
+# Kotlin dependencies
+kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+
+# AndroidX dependencies
+androidx-activityKtx = "androidx.activity:activity-ktx:1.3.0-alpha06"
+androidx-annotation = "androidx.annotation:annotation:1.1.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"
+androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0-beta01"
+androidx-coreKtx = "androidx.core:core-ktx:1.6.0-alpha01"
+androidx-documentfile = "androidx.documentfile:documentfile:1.0.1"
+androidx-fragmentKtx = "androidx.fragment:fragment-ktx:1.3.2"
+androidx-lifecycle_common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref="lifecycle" }
+androidx-lifecycle_livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" }
+androidx-lifecycle_viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref="lifecycle" }
+androidx-material = "com.google.android.material:material:1.4.0-alpha02"
+androidx-preference = "androidx.preference:preference:1.1.1"
+androidx-recyclerview = "androidx.recyclerview:recyclerview:1.2.0"
+androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.1.0"
+androidx-security = "androidx.security:security-crypto:1.1.0-alpha03"
+androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
+
+# First-party libraries
+aps-sublimeFuzzy = "com.github.android-password-store:sublime-fuzzy:1.0.0"
+aps-zxingAndroidEmbedded = "com.github.android-password-store:zxing-android-embedded:4.1.0-aps"
+
+# Third-party dependencies
+thirdparty-bouncycastle = "org.bouncycastle:bcprov-jdk15on:1.68"
+thirdparty-commons_codec = "commons-codec:commons-codec:1.14"
+thirdparty-eddsa = "net.i2p.crypto:eddsa:0.3.0"
+thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.5"
+thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r"
+thirdparty-kotlinResult = "com.michael-bull.kotlin-result:kotlin-result:1.1.11"
+thirdparty-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.7"
+thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.0"
+thirdparty-plumber = "com.squareup.leakcanary:plumber-android:2.7"
+thirdparty-sshj = "com.hierynomus:sshj:0.31.0"
+thirdparty-sshauth = "com.github.open-keychain.open-keychain:sshauthentication-api:v5.7.1"
+thirdparty-timber = "com.jakewharton.timber:timber:4.7.1"
+thirdparty-timberkt = "com.github.ajalt:timberkt:1.5.1"
+thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.0"
+thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:17.5.0"
+
+# Testing dependencies
+testing-junit = "junit:junit:4.13.2"
+testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
+androidx-testing-rules = { module = "androidx.test:rules", version.ref="androidx_test" }
+androidx-testing-runner = { module = "androidx.test:runner", version.ref="androidx_test" }
+
+# Bundles of dependencies usually used together so they can be included in one go
+[bundles]
+androidxLifecycle = ["androidx-lifecycle_common", "androidx-lifecycle_livedataKtx", "androidx-lifecycle_viewmodelKtx"]
+testDependencies = ["testing-junit", "testing-kotlintest-junit"]
+androidTestDependencies = ["androidx-testing-rules", "androidx-testing-runner"]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7858495e..9d174797 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,11 +1,6 @@
-#
-# Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
-# SPDX-License-Identifier: GPL-3.0-only
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionSha256Sum=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists