Revert back to Groovy DSL

The Kotlin DSL's API is extremely terrible and makes the simplest tasks annoying. It also introduces a very noticeable build overhead that I'd rather not have.

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

2 files changed, 106 insertions, 114 deletions

diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 00000000..a97ebab7
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2014-2019 The Android Password Store Authors. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'kotlin-android-extensions'
+}
+
+android {
+    defaultConfig {
+        applicationId 'com.zeapo.pwdstore'
+    }
+
+    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 getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            applicationIdSuffix = '.debug'
+            versionNameSuffix = '-debug'
+            minifyEnabled = false
+        }
+    }
+
+    /*
+     * To sign release builds, create the file `gradle.properties` in
+     * $HOME/.gradle or in your project directory with this content:
+     *
+     * mStoreFile=/path/to/key.store
+     * mStorePassword=xxx
+     * mKeyAlias=alias
+     * mKeyPassword=xxx
+     */
+    if (project.hasProperty('mStoreFile') &&
+            project.hasProperty('mStorePassword') &&
+            project.hasProperty('mKeyAlias') &&
+            project.hasProperty('mKeyPassword')) {
+        signingConfigs {
+            release {
+                storeFile = file(project.properties['mStoreFile'] as String)
+                storePassword = project.properties['mStorePassword'] as String
+                keyAlias = project.properties['mKeyAlias'] as String
+                keyPassword = project.properties['mKeyPassword'] as String
+            }
+        }
+        buildTypes.release.signingConfig = signingConfigs.release
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:' + versions.appcompat
+    implementation 'androidx.cardview:cardview:' + versions.cardview
+    implementation 'androidx.core:core-ktx:' + versions.coreKtx
+    implementation 'androidx.constraintlayout:constraintlayout:' + versions.constraintLayout
+    implementation 'androidx.documentfile:documentfile:' + versions.documentfile
+    implementation 'androidx.preference:preference:' + versions.preference
+    implementation ('androidx.recyclerview:recyclerview:' + versions.recyclerview) {
+        force = true
+    }
+    implementation 'com.google.android.material:material:' + versions.material
+    implementation 'androidx.annotation:annotation:' + versions.annotation
+    implementation 'androidx.biometric:biometric:' + versions.biometric
+    implementation 'org.sufficientlysecure:openpgp-api:' + versions.openpgp
+    implementation('org.eclipse.jgit:org.eclipse.jgit:' + versions.jgit) {
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+    }
+    implementation 'com.jcraft:jsch:' + versions.jsch
+    implementation 'commons-io:commons-io:' + versions.commons_io
+    implementation 'commons-codec:commons-codec:' + versions.commons_codec
+    implementation 'org.sufficientlysecure:sshauthentication-api:' + versions.sshauth
+
+    // Testing-only dependencies
+    androidTestImplementation 'junit:junit:4.13-beta-3'
+    androidTestImplementation 'org.mockito:mockito-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
+    androidTestImplementation 'androidx.test:rules:1.3.0-alpha02'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2-alpha02'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0-alpha02'
+}
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << '-Xlint:unchecked'
+    options.deprecation = true
+}
+tasks.withType(KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
deleted file mode 100644
index 1d0955c2..00000000
--- a/app/build.gradle.kts
+++ /dev/null
@@ -1,114 +0,0 @@
-import org.gradle.api.JavaVersion.VERSION_1_8
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    id("com.android.application")
-    id("kotlin-android")
-    id("kotlin-android-extensions")
-    id("eclipse")
-}
-
-android {
-    compileSdkVersion(29)
-
-    defaultConfig {
-        applicationId = "com.zeapo.pwdstore"
-        minSdkVersion(21)
-        targetSdkVersion(29)
-        versionCode = 10303
-        versionName = "1.3.3"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        getByName("debug") {
-            applicationIdSuffix = ".debug"
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = VERSION_1_8
-        targetCompatibility = VERSION_1_8
-    }
-
-    lintOptions {
-        isAbortOnError = true // make sure build fails with lint errors!
-        disable("MissingTranslation", "PluralsCandidate")
-    }
-
-    packagingOptions {
-        exclude(".readme")
-        exclude("META-INF/LICENSE.txt")
-        exclude("META-INF/NOTICE.txt")
-    }
-
-    /*
-     * To sign release builds, create the file `gradle.properties` in
-     * $HOME/.gradle or in your project directory with this content:
-     *
-     * mStoreFile=/path/to/key.store
-     * mStorePassword=xxx
-     * mKeyAlias=alias
-     * mKeyPassword=xxx
-     */
-    if (project.hasProperty("mStoreFile") &&
-            project.hasProperty("mStorePassword") &&
-            project.hasProperty("mKeyAlias") &&
-            project.hasProperty("mKeyPassword")) {
-        signingConfigs {
-            getByName("release") {
-                storeFile = file(project.properties["mStoreFile"] as String)
-                storePassword = project.properties["mStorePassword"] as String
-                keyAlias = project.properties["mKeyAlias"] as String
-                keyPassword = project.properties["mKeyPassword"] as String
-            }
-        }
-        buildTypes.getByName("release").signingConfig = signingConfigs.getByName("release")
-    }
-}
-
-dependencies {
-    implementation("androidx.appcompat:appcompat:1.1.0")
-    implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.core:core-ktx:1.2.0-beta01")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta3")
-    implementation("androidx.documentfile:documentfile:1.0.1")
-    implementation("androidx.preference:preference:1.1.0")
-    implementation("androidx.recyclerview:recyclerview:1.1.0-rc01")
-    implementation("com.google.android.material:material:1.1.0-alpha10")
-    implementation("androidx.annotation:annotation:1.1.0")
-    implementation("androidx.biometric:biometric:1.0.0-rc02")
-    implementation("org.sufficientlysecure:openpgp-api:12.0")
-    implementation("org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r") {
-        exclude(group = "org.apache.httpcomponents", module = "httpclient")
-    }
-    implementation("com.jcraft:jsch:0.1.55")
-    implementation("commons-io:commons-io:2.5")
-    implementation("commons-codec:commons-codec:1.13")
-    implementation("com.jayway.android.robotium:robotium-solo:5.6.3")
-    implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION))
-    implementation("org.sufficientlysecure:sshauthentication-api:1.0")
-
-    // Testing-only dependencies
-    androidTestImplementation("junit:junit:4.13-beta-3")
-    androidTestImplementation("org.mockito:mockito-core:3.1.0")
-    androidTestImplementation("androidx.test:runner:1.3.0-alpha02")
-    androidTestImplementation("androidx.test:rules:1.3.0-alpha02")
-    androidTestImplementation("androidx.test.ext:junit:1.1.2-alpha02")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0-alpha02")
-    androidTestImplementation("androidx.test.espresso:espresso-intents:3.3.0-alpha02")
-}
-
-tasks {
-    withType<JavaCompile> {
-        options.compilerArgs.add("-Xlint:unchecked")
-        options.isDeprecation = true
-    }
-    withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "1.8"
-            freeCompilerArgs = freeCompilerArgs + "-Xnew-inference"
-        }
-    }
-}