From fe0b9bb54b944d2faf71a97b5a5fae9ee552a7e4 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 18 Jul 2020 02:56:40 +0530
Subject: [PATCH 01/10] build: switch to Gradle Kotlin DSL

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .idea/gradle.xml                         |   1 +
 app/build.gradle                         | 142 ----------------------
 app/build.gradle.kts                     | 148 +++++++++++++++++++++++
 build.gradle                             |  69 -----------
 build.gradle.kts                         |  64 ++++++++++
 buildSrc/.gitignore                      |   1 +
 buildSrc/build.gradle.kts                |  11 ++
 buildSrc/src/main/java/Dependencies.kt   |  86 +++++++++++++
 dependencies.gradle                      |  82 -------------
 gradle/wrapper/gradle-wrapper.properties |   5 -
 settings.gradle => settings.gradle.kts   |   2 +-
 11 files changed, 312 insertions(+), 299 deletions(-)
 delete mode 100644 app/build.gradle
 create mode 100644 app/build.gradle.kts
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 create mode 100644 buildSrc/.gitignore
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/src/main/java/Dependencies.kt
 delete mode 100644 dependencies.gradle
 rename settings.gradle => settings.gradle.kts (89%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2df14bed5b..f7e941c793 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,6 +12,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/buildSrc" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 7d77ece180..0000000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
- */
-plugins {
-    id 'kotlin-android'
-}
-
-final def keystorePropertiesFile = rootProject.file 'keystore.properties'
-
-static final def isSnapshot() {
-    return System.env['GITHUB_WORKFLOW'] != null && System.env['SNAPSHOT'] != null
-}
-
-android {
-    if (isSnapshot()) {
-        android.applicationVariants.all { final variant ->
-            variant.outputs.all {
-                outputFileName = "aps-${variant.getFlavorName()}_${defaultConfig.versionName}.apk"
-            }
-        }
-    }
-
-    buildFeatures.viewBinding = true
-
-    defaultConfig {
-        applicationId 'dev.msfjarvis.aps'
-        versionCode 10921
-        versionName '1.10.0-SNAPSHOT'
-    }
-
-    lintOptions {
-        abortOnError = true // make sure build fails with lint errors!
-        disable 'MissingTranslation', 'PluralsCandidate'
-    }
-
-    packagingOptions {
-        exclude '.readme'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled = true
-            proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
-            buildConfigField 'boolean', 'ENABLE_DEBUG_FEATURES', isSnapshot() ? 'true' : 'false'
-        }
-        debug {
-            applicationIdSuffix = '.debug'
-            versionNameSuffix = '-debug'
-            minifyEnabled = false
-            buildConfigField 'boolean', 'ENABLE_DEBUG_FEATURES', 'true'
-        }
-    }
-
-    if (keystorePropertiesFile.exists()) {
-        final def keystoreProperties = new Properties()
-        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-        signingConfigs {
-            release {
-                keyAlias = keystoreProperties['keyAlias']
-                keyPassword = keystoreProperties['keyPassword']
-                storeFile = rootProject.file keystoreProperties['storeFile']
-                storePassword = keystoreProperties['storePassword']
-            }
-        }
-        buildTypes.release.signingConfig = signingConfigs.release
-        buildTypes.debug.signingConfig = signingConfigs.release
-    }
-
-    flavorDimensions "free"
-    productFlavors {
-        free {
-            versionNameSuffix "-free"
-        }
-        nonFree {
-        }
-    }
-}
-
-dependencies {
-    implementation deps.androidx.activity_ktx
-    implementation deps.androidx.annotation
-    implementation deps.androidx.autofill
-    implementation deps.androidx.appcompat
-    implementation deps.androidx.biometric
-    implementation deps.androidx.constraint_layout
-    implementation deps.androidx.core_ktx
-    implementation deps.androidx.documentfile
-    implementation deps.androidx.fragment_ktx
-    implementation deps.androidx.lifecycle_common
-    implementation deps.androidx.lifecycle_livedata_ktx
-    implementation deps.androidx.lifecycle_viewmodel_ktx
-    implementation deps.androidx.material
-    implementation deps.androidx.preference
-    implementation deps.androidx.recycler_view
-    implementation deps.androidx.recycler_view_selection
-    implementation deps.androidx.security
-    implementation deps.androidx.swiperefreshlayout
-
-    implementation deps.kotlin.coroutines.android
-    implementation deps.kotlin.coroutines.core
-
-    implementation deps.first_party.openpgp_ktx
-    implementation deps.first_party.zxing_android_embedded
-
-    implementation deps.third_party.commons_codec
-    implementation deps.third_party.fastscroll
-    implementation(deps.third_party.jgit) {
-        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-    }
-    implementation deps.third_party.jsch
-    implementation deps.third_party.sshj
-    implementation deps.third_party.bouncycastle
-    implementation deps.third_party.plumber
-    implementation deps.third_party.ssh_auth
-    implementation deps.third_party.timber
-    implementation deps.third_party.timberkt
-
-    if (isSnapshot()) {
-        implementation deps.third_party.leakcanary
-        implementation deps.third_party.whatthestack
-    } else {
-        debugImplementation deps.third_party.leakcanary
-        debugImplementation deps.third_party.whatthestack
-    }
-
-    nonFreeImplementation deps.non_free.google_play_auth_api_phone
-
-    // Testing-only dependencies
-    androidTestImplementation deps.testing.junit
-    androidTestImplementation deps.testing.kotlin_test_junit
-    androidTestImplementation deps.testing.androidx.runner
-    androidTestImplementation deps.testing.androidx.rules
-    androidTestImplementation deps.testing.androidx.junit
-    androidTestImplementation deps.testing.androidx.espresso_core
-    androidTestImplementation deps.testing.androidx.espresso_intents
-
-    testImplementation deps.testing.junit
-    testImplementation deps.testing.kotlin_test_junit
-}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000000..146366db34
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,148 @@
+/*
+ * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import java.util.Properties
+
+plugins {
+    kotlin("android")
+}
+
+val keystorePropertiesFile = rootProject.file("keystore.properties")
+
+fun isSnapshot(): Boolean {
+    return System.getenv("GITHUB_WORKFLOW") != null && System.getenv("SNAPSHOT") != null
+}
+
+android {
+    /*
+    if (isSnapshot()) {
+        android.applicationVariants.all { variant ->
+            variant.outputs.all {
+                outputFileName = "aps-${variant.getFlavorName()}_${defaultConfig.versionName}.apk"
+            }
+        }
+    }
+    */
+
+    buildFeatures.viewBinding = true
+
+    defaultConfig {
+        applicationId = "dev.msfjarvis.aps"
+        versionCode = 10921
+        versionName = "1.10.0-SNAPSHOT"
+    }
+
+    lintOptions {
+        isAbortOnError = true
+        disable("MissingTranslation", "PluralsCandidate")
+    }
+
+    packagingOptions {
+        exclude(".readme")
+        exclude("META-INF/LICENSE.txt")
+        exclude("META-INF/NOTICE.txt")
+    }
+
+    buildTypes {
+        named("release") {
+            isMinifyEnabled = true
+            setProguardFiles(listOf("proguard-android-optimize.txt", "proguard-rules.pro"))
+            buildConfigField("boolean", "ENABLE_DEBUG_FEATURES", if (isSnapshot()) "true" else "false")
+        }
+        named("debug") {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+            isMinifyEnabled = false
+            buildConfigField("boolean", "ENABLE_DEBUG_FEATURES", "true")
+        }
+    }
+
+    if (keystorePropertiesFile.exists()) {
+        val keystoreProperties = Properties()
+        keystoreProperties.load(keystorePropertiesFile.inputStream())
+        signingConfigs {
+            register("release") {
+                keyAlias = keystoreProperties["keyAlias"] as String
+                keyPassword = keystoreProperties["keyPassword"] as String
+                storeFile = rootProject.file(keystoreProperties["storeFile"] as String)
+                storePassword = keystoreProperties["storePassword"] as String
+            }
+        }
+        buildTypes.getByName("release").signingConfig = signingConfigs.getByName("release")
+        buildTypes.getByName("debug").signingConfig = signingConfigs.getByName("release")
+    }
+
+    flavorDimensions("free")
+    productFlavors {
+        create("free") {
+            versionNameSuffix = "-free"
+        }
+        create("nonFree") {
+        }
+    }
+}
+
+dependencies {
+    implementation(Dependencies.AndroidX.activity_ktx)
+    implementation(Dependencies.AndroidX.annotation)
+    implementation(Dependencies.AndroidX.autofill)
+    implementation(Dependencies.AndroidX.appcompat)
+    implementation(Dependencies.AndroidX.biometric)
+    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)
+
+    implementation(Dependencies.Kotlin.Coroutines.android)
+    implementation(Dependencies.Kotlin.Coroutines.core)
+    implementation(Dependencies.Kotlin.stdlib8)
+
+    implementation(Dependencies.FirstParty.openpgp_ktx)
+    implementation(Dependencies.FirstParty.zxing_android_embedded)
+
+    implementation(Dependencies.ThirdParty.commons_codec)
+    implementation(Dependencies.ThirdParty.fastscroll)
+    implementation(Dependencies.ThirdParty.jgit) {
+        exclude(group = "org.apache.httpcomponents", module = "httpclient")
+    }
+    implementation(Dependencies.ThirdParty.jsch)
+    implementation(Dependencies.ThirdParty.sshj)
+    implementation(Dependencies.ThirdParty.bouncycastle)
+    implementation(Dependencies.ThirdParty.plumber)
+    implementation(Dependencies.ThirdParty.ssh_auth)
+    implementation(Dependencies.ThirdParty.timber)
+    implementation(Dependencies.ThirdParty.timberkt)
+
+    if (isSnapshot()) {
+        implementation(Dependencies.ThirdParty.leakcanary)
+        implementation(Dependencies.ThirdParty.whatthestack)
+    } else {
+        debugImplementation(Dependencies.ThirdParty.leakcanary)
+        debugImplementation(Dependencies.ThirdParty.whatthestack)
+    }
+
+    // Workaround for product flavors not resolving correctly
+    "nonFreeImplementation"(Dependencies.NonFree.google_play_auth_api_phone)
+
+    // Testing-only dependencies
+    androidTestImplementation(Dependencies.Testing.junit)
+    androidTestImplementation(Dependencies.Testing.kotlin_test_junit)
+    androidTestImplementation(Dependencies.Testing.AndroidX.runner)
+    androidTestImplementation(Dependencies.Testing.AndroidX.rules)
+    androidTestImplementation(Dependencies.Testing.AndroidX.junit)
+    androidTestImplementation(Dependencies.Testing.AndroidX.espresso_core)
+    androidTestImplementation(Dependencies.Testing.AndroidX.espresso_intents)
+
+    testImplementation(Dependencies.Testing.junit)
+    testImplementation(Dependencies.Testing.kotlin_test_junit)
+}
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 7490782ce8..0000000000
--- a/build.gradle
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
- */
-buildscript {
-    apply from: rootProject.file('dependencies.gradle')
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath deps.gradle_plugin.android
-        classpath deps.gradle_plugin.kotlin
-    }
-}
-
-plugins {
-    id 'com.github.ben-manes.versions' version '0.28.0'
-}
-
-subprojects {
-    apply from: rootProject.file('dependencies.gradle')
-    repositories {
-        google()
-        jcenter()
-        maven {
-            url 'https://jitpack.io'
-        }
-    }
-    pluginManager.withPlugin('kotlin-android') {
-        dependencies {
-            implementation deps.kotlin.stdlib8
-        }
-    }
-    if (name == 'app') {
-        apply plugin: 'com.android.application'
-    } else {
-        apply plugin: 'com.android.library'
-    }
-    android {
-        compileSdkVersion versions.compileSdk
-        buildToolsVersion = versions.buildTools
-        defaultConfig {
-            minSdkVersion versions.minSdk
-            targetSdkVersion versions.targetSdk
-            testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        }
-        compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
-        }
-    }
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << '-Xlint:unchecked'
-        options.deprecation = true
-    }
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-        kotlinOptions {
-            jvmTarget = '1.8'
-            freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-        }
-    }
-}
-
-tasks.wrapper {
-    gradleVersion = "6.5.1"
-    distributionType = Wrapper.DistributionType.ALL
-    distributionSha256Sum = "143a28f54f1ae93ef4f72d862dbc3c438050d81bb45b4601eb7076e998362920"
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000..260f9f6dfc
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import com.android.build.gradle.BaseExtension
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath(Plugins.agp)
+        classpath(Plugins.kotlin)
+    }
+}
+
+plugins {
+    id("com.github.ben-manes.versions") version "0.28.0"
+}
+
+subprojects {
+    repositories {
+        google()
+        jcenter()
+        maven {
+          setUrl("https://jitpack.io")
+        }
+    }
+    if (name == "app") {
+        apply(plugin = "com.android.application")
+    } else {
+        apply(plugin = "com.android.library")
+    }
+    configure<BaseExtension> {
+        compileSdkVersion(29)
+        defaultConfig {
+            minSdkVersion(23)
+            targetSdkVersion(29)
+            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        }
+        compileOptions {
+            sourceCompatibility = JavaVersion.VERSION_1_8
+            targetCompatibility = JavaVersion.VERSION_1_8
+        }
+        tasks.withType<JavaCompile> {
+            options.compilerArgs.add("-Xlint:unchecked")
+            options.isDeprecation = true
+        }
+    }
+    tasks.withType<KotlinCompile> {
+        kotlinOptions {
+            jvmTarget = "1.8"
+            freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
+        }
+    }
+}
+
+tasks.wrapper {
+    gradleVersion = "6.5.1"
+    distributionType = Wrapper.DistributionType.ALL
+    distributionSha256Sum = "143a28f54f1ae93ef4f72d862dbc3c438050d81bb45b4601eb7076e998362920"
+}
diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/buildSrc/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000000..3457e2c269
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    jcenter()
+}
+
+kotlinDslPluginOptions {
+    experimentalWarning.set(false)
+}
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
new file mode 100644
index 0000000000..675d124aef
--- /dev/null
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+object Plugins {
+
+    const val agp = "com.android.tools.build:gradle:4.0.0"
+    const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
+}
+
+object Dependencies {
+    object Kotlin {
+        object Coroutines {
+
+            const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
+            const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
+        }
+
+        const val stdlib8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72"
+    }
+
+    object AndroidX {
+
+        const val activity_ktx = "androidx.activity:activity-ktx:1.2.0-alpha06"
+        const val annotation = "androidx.annotation:annotation:1.2.0-alpha01"
+        const val autofill = "androidx.autofill:autofill:1.0.0"
+        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-beta7"
+        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-alpha06"
+        const val lifecycle_common = "androidx.lifecycle:lifecycle-common-java8:2.3.0-alpha05"
+        const val lifecycle_livedata_ktx = "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha05"
+        const val lifecycle_viewmodel_ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha05"
+        const val material = "com.google.android.material:material:1.3.0-alpha01"
+        const val preference = "androidx.preference:preference:1.1.1"
+        const val recycler_view = "androidx.recyclerview:recyclerview:1.2.0-alpha04"
+        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 swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+    }
+
+    object FirstParty {
+
+        const val openpgp_ktx = "com.github.android-password-store:openpgp-ktx:2.0.0"
+        const val zxing_android_embedded = "com.github.android-password-store:zxing-android-embedded:v4.1.0-aps"
+    }
+
+    object ThirdParty {
+
+        const val bouncycastle = "org.bouncycastle:bcprov-jdk15on:1.65.01"
+        const val commons_codec = "commons-codec:commons-codec:1.13"
+        const val fastscroll = "me.zhanghai.android.fastscroll:library:1.1.4"
+        const val jsch = "com.jcraft:jsch:0.1.55"
+        const val jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r"
+        const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.4"
+        const val plumber = "com.squareup.leakcanary:plumber-android:2.4"
+        const val sshj = "com.hierynomus:sshj:0.29.0"
+        const val ssh_auth = "org.sufficientlysecure:sshauthentication-api:1.0"
+        const val timber = "com.jakewharton.timber:timber:4.7.1"
+        const val timberkt = "com.github.ajalt:timberkt:1.5.1"
+        const val whatthestack = "com.github.haroldadmin:WhatTheStack:0.0.3"
+    }
+
+    object NonFree {
+
+        const val google_play_auth_api_phone = "com.google.android.gms:play-services-auth-api-phone:17.4.0"
+    }
+
+    object Testing {
+
+        const val junit = "junit:junit:4.13"
+        const val kotlin_test_junit = "org.jetbrains.kotlin:kotlin-test-junit:1.3.72"
+
+        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"
+        }
+    }
+}
diff --git a/dependencies.gradle b/dependencies.gradle
deleted file mode 100644
index d05e0e6da3..0000000000
--- a/dependencies.gradle
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
- */
-ext.versions = [
-    minSdk: 23,
-    targetSdk: 29,
-    compileSdk: 29,
-    buildTools: '29.0.3'
-]
-
-ext.deps = [
-    gradle_plugin: [
-        android: 'com.android.tools.build:gradle:4.0.0',
-        kotlin: 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72',
-    ],
-
-    kotlin: [
-        coroutines: [
-            android: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7',
-            core: 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7',
-        ],
-        stdlib8: 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72'
-    ],
-
-    androidx: [
-        activity_ktx: 'androidx.activity:activity-ktx:1.2.0-alpha06',
-        annotation: 'androidx.annotation:annotation:1.2.0-alpha01',
-        autofill: 'androidx.autofill:autofill:1.0.0',
-        appcompat: 'androidx.appcompat:appcompat:1.3.0-alpha01',
-        biometric: 'androidx.biometric:biometric:1.1.0-alpha01',
-        constraint_layout: 'androidx.constraintlayout:constraintlayout:2.0.0-beta7',
-        core_ktx: 'androidx.core:core-ktx:1.5.0-alpha01',
-        documentfile: 'androidx.documentfile:documentfile:1.0.1',
-        fragment_ktx: 'androidx.fragment:fragment-ktx:1.3.0-alpha06',
-        lifecycle_common: 'androidx.lifecycle:lifecycle-common-java8:2.3.0-alpha05',
-        lifecycle_livedata_ktx: 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha05',
-        lifecycle_viewmodel_ktx: 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha05',
-        material: 'com.google.android.material:material:1.3.0-alpha01',
-        preference: 'androidx.preference:preference:1.1.1',
-        recycler_view: 'androidx.recyclerview:recyclerview:1.2.0-alpha04',
-        recycler_view_selection: 'androidx.recyclerview:recyclerview-selection:1.1.0-rc01',
-        security: 'androidx.security:security-crypto:1.1.0-alpha01',
-        swiperefreshlayout: 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    ],
-
-    first_party: [
-        openpgp_ktx: 'com.github.android-password-store:openpgp-ktx:2.0.0',
-        zxing_android_embedded: 'com.github.android-password-store:zxing-android-embedded:v4.1.0-aps'
-    ],
-
-    third_party: [
-        bouncycastle: 'org.bouncycastle:bcprov-jdk15on:1.65.01',
-        commons_codec: 'commons-codec:commons-codec:1.13',
-        fastscroll: 'me.zhanghai.android.fastscroll:library:1.1.4',
-        jsch: 'com.jcraft:jsch:0.1.55',
-        jgit: 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r',
-        leakcanary: 'com.squareup.leakcanary:leakcanary-android:2.4',
-        plumber: 'com.squareup.leakcanary:plumber-android:2.4',
-        sshj: 'com.hierynomus:sshj:0.29.0',
-        ssh_auth: 'org.sufficientlysecure:sshauthentication-api:1.0',
-        timber: 'com.jakewharton.timber:timber:4.7.1',
-        timberkt: 'com.github.ajalt:timberkt:1.5.1',
-        whatthestack: 'com.github.haroldadmin:WhatTheStack:0.0.3',
-    ],
-
-    non_free: [
-        google_play_auth_api_phone: 'com.google.android.gms:play-services-auth-api-phone:17.4.0',
-    ],
-
-    testing: [
-        junit: 'junit:junit:4.13',
-        kotlin_test_junit: 'org.jetbrains.kotlin:kotlin-test-junit:1.3.72',
-        androidx: [
-            runner: 'androidx.test:runner:1.3.0-rc01',
-            rules: 'androidx.test:rules:1.3.0-rc01',
-            junit: 'androidx.test.ext:junit:1.1.2-rc01',
-            espresso_core: 'androidx.test.espresso:espresso-core:3.3.0-rc01',
-            espresso_intents: 'androidx.test.espresso:espresso-intents:3.3.0-rc01'
-        ]
-    ]
-]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6fa3f76aff..28b21a0c03 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,3 @@
-#
-# Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-# SPDX-License-Identifier: GPL-3.0-only
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=143a28f54f1ae93ef4f72d862dbc3c438050d81bb45b4601eb7076e998362920
diff --git a/settings.gradle b/settings.gradle.kts
similarity index 89%
rename from settings.gradle
rename to settings.gradle.kts
index 47fd3b8283..a418994b10 100644
--- a/settings.gradle
+++ b/settings.gradle.kts
@@ -2,4 +2,4 @@
  * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-include ':app'
+include(":app")

From 8e4c22c42d9ad35475aee29ebad20e7663eee8e9 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 18 Jul 2020 03:09:12 +0530
Subject: [PATCH 02/10] gradle: turn on FS watching

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 gradle.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index 218affe78c..ca214f0f4c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,3 +20,6 @@ android.useMinimalKeepRules=true
 # references to the resources it declares instead of declarations plus all
 # transitive dependency references.
 android.namespacedRClass=true
+
+# Gradle FS watching
+org.gradle.unsafe.watch-fs=true

From 814a6d3645d44c6e302179457e9b2ca04be90af0 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 18 Jul 2020 17:22:20 +0530
Subject: [PATCH 03/10] build: disable Lint on release builds

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 146366db34..e4fd073f61 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -35,6 +35,7 @@ android {
 
     lintOptions {
         isAbortOnError = true
+        isCheckReleaseBuilds = false
         disable("MissingTranslation", "PluralsCandidate")
     }
 

From 79c12e80f9eddfbecdb7ade10572ff103fe7cc28 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 18 Jul 2020 18:54:33 +0530
Subject: [PATCH 04/10] Update AGP

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 buildSrc/src/main/java/Dependencies.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 675d124aef..16bece9fd3 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -5,7 +5,7 @@
 
 object Plugins {
 
-    const val agp = "com.android.tools.build:gradle:4.0.0"
+    const val agp = "com.android.tools.build:gradle:4.0.1"
     const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
 }
 

From ee425339c4e507ac0abd32c9357a2beff9d85a15 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 18 Jul 2020 20:12:37 +0530
Subject: [PATCH 05/10] gradle: add build health plugin

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 260f9f6dfc..55cdded599 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,6 +18,7 @@ buildscript {
 
 plugins {
     id("com.github.ben-manes.versions") version "0.28.0"
+    id("com.autonomousapps.dependency-analysis") version "0.53.0"
 }
 
 subprojects {

From e5a296be322075785206d780fbfd23ccfc63c723 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 18 Jul 2020 20:13:12 +0530
Subject: [PATCH 06/10] build: mark AndroidX annotation as compileOnly

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e4fd073f61..0f6216973d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -85,8 +85,8 @@ android {
 }
 
 dependencies {
+    compileOnly(Dependencies.AndroidX.annotation)
     implementation(Dependencies.AndroidX.activity_ktx)
-    implementation(Dependencies.AndroidX.annotation)
     implementation(Dependencies.AndroidX.autofill)
     implementation(Dependencies.AndroidX.appcompat)
     implementation(Dependencies.AndroidX.biometric)

From 8dcf41258dc7f983c3e71af2411fb81e27380d57 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 18 Jul 2020 20:16:23 +0530
Subject: [PATCH 07/10] build: remove unneeded explicit dependency

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle.kts                   | 1 -
 buildSrc/src/main/java/Dependencies.kt | 2 --
 2 files changed, 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0f6216973d..3bda2bf583 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -106,7 +106,6 @@ dependencies {
 
     implementation(Dependencies.Kotlin.Coroutines.android)
     implementation(Dependencies.Kotlin.Coroutines.core)
-    implementation(Dependencies.Kotlin.stdlib8)
 
     implementation(Dependencies.FirstParty.openpgp_ktx)
     implementation(Dependencies.FirstParty.zxing_android_embedded)
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 16bece9fd3..aa0b992fd0 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -16,8 +16,6 @@ object Dependencies {
             const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
             const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
         }
-
-        const val stdlib8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72"
     }
 
     object AndroidX {

From 011de947cf7845b423fc5ebaf5d93b1d7ceaf881 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 23 Jul 2020 13:07:32 +0530
Subject: [PATCH 08/10] build: bring back output renaming

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle.kts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7a4831c639..105a72fbcb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 import java.util.Properties
+import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 
 plugins {
     kotlin("android")
@@ -15,15 +16,13 @@ fun isSnapshot(): Boolean {
 }
 
 android {
-    /*
     if (isSnapshot()) {
-        android.applicationVariants.all { variant ->
-            variant.outputs.all {
-                outputFileName = "aps-${variant.getFlavorName()}_${defaultConfig.versionName}.apk"
+        applicationVariants.all {
+            outputs.all {
+                (this as BaseVariantOutputImpl).outputFileName = "aps-${flavorName}_$versionName.apk"
             }
         }
     }
-    */
 
     buildFeatures.viewBinding = true
 

From 7630a68d0bd2d94fc376f96ffdf8f1f5dc869754 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 23 Jul 2020 13:10:02 +0530
Subject: [PATCH 09/10] build: not a workaround

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 105a72fbcb..e7017a380b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -130,7 +130,6 @@ dependencies {
         debugImplementation(Dependencies.ThirdParty.whatthestack)
     }
 
-    // Workaround for product flavors not resolving correctly
     "nonFreeImplementation"(Dependencies.NonFree.google_play_auth_api_phone)
 
     // Testing-only dependencies

From c30a433a9bd88dcc73d866b1c0f76891039072e5 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 23 Jul 2020 13:44:08 +0530
Subject: [PATCH 10/10] build: little dash of fanciness

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle.kts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e7017a380b..a63151c07d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -69,8 +69,9 @@ android {
                 storePassword = keystoreProperties["storePassword"] as String
             }
         }
-        buildTypes.getByName("release").signingConfig = signingConfigs.getByName("release")
-        buildTypes.getByName("debug").signingConfig = signingConfigs.getByName("release")
+        listOf("release", "debug").map {
+            buildTypes.getByName(it).signingConfig = signingConfigs.getByName(it)
+        }
     }
 
     flavorDimensions("free")