From 3ea19957d4551d41aaeb71fc7e6c8969a44db983 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Sun, 31 May 2020 13:09:21 +0200
Subject: [PATCH] Gradle cleanup

---
 OpenKeychain/.gitignore            | 33 ------------------------------
 OpenKeychain/build.gradle          | 22 +++-----------------
 nfcsweetspot/.gitignore            | 33 ------------------------------
 nfcsweetspot/build.gradle          |  3 ---
 sshauthentication-api/build.gradle | 11 ----------
 5 files changed, 3 insertions(+), 99 deletions(-)
 delete mode 100644 OpenKeychain/.gitignore
 delete mode 100644 nfcsweetspot/.gitignore

diff --git a/OpenKeychain/.gitignore b/OpenKeychain/.gitignore
deleted file mode 100644
index a44cc0f0f..000000000
--- a/OpenKeychain/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-#Android specific
-bin
-gen
-obj
-lint.xml
-local.properties
-release.properties
-ant.properties
-*.class
-*.apk
-
-#Gradle
-.gradle
-build
-gradle.properties
-
-#Maven
-target
-pom.xml.*
-
-#Eclipse
-.project
-.classpath
-.settings
-.metadata
-
-#IntelliJ IDEA
-.idea
-*.iml
-
-#Lint output
-lint-report.html
-lint-report_files/*
\ No newline at end of file
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 4d30c922e..48d9cee8d 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -1,11 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.squareup.sqldelight'
-// apply plugin: 'com.github.kt3k.coveralls'
 
 dependencies {
-    // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
-    // NOTE: libraries are pinned to a specific build, see below
-
     // from local Android SDK
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -16,7 +12,7 @@ dependencies {
 
     // JCenter etc.
     implementation 'com.journeyapps:zxing-android-embedded:3.4.0'
-    implementation 'com.google.zxing:core:3.3.0'
+    implementation 'com.google.zxing:core:3.4.0'
     implementation 'org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.1'
     implementation 'org.sufficientlysecure:donations:2.5'
     implementation 'com.squareup.okhttp3:okhttp:3.13.1'
@@ -40,7 +36,7 @@ dependencies {
     implementation 'com.mikepenz:materialdrawer:6.1.2@aar'
     implementation 'com.mikepenz:fastadapter:3.3.0'
     implementation 'com.mikepenz:fastadapter-extensions-expandable:3.3.0'
-    implementation 'com.mikepenz:materialize:1.2.0'
+    implementation 'com.mikepenz:materialize:1.2.1'
     implementation 'com.mikepenz:iconics-core:3.1.0@aar'
     implementation 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
     implementation 'com.mikepenz:fontawesome-typeface:5.3.1.1@aar'
@@ -66,7 +62,7 @@ dependencies {
     // https://developer.android.com/training/testing/unit-testing/local-unit-tests.html
     // http://robolectric.org/getting-started/
     // http://www.vogella.com/tutorials/Robolectric/article.html
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation ('org.robolectric:robolectric:3.8') {
         exclude group: 'org.bouncycastle', module: 'bcprov-jdk16'
     }
@@ -269,15 +265,3 @@ android {
     }
 }
 
-// Fix for: No report file available: [/home/travis/build/open-keychain/open-keychain/OpenKeychain/build/reports/cobertura/coverage.xml, /home/travis/build/open-keychain/open-keychain/OpenKeychain/build/reports/jacoco/test/jacocoTestReport.xml]
-// coveralls {
-    // jacocoReportPath 'build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml'
-// }
-
-// NOTE: This disables Lint!
-tasks.whenTaskAdded { task ->
-    if (task.name.contains('lint')) {
-        task.enabled = false
-    }
-}
-
diff --git a/nfcsweetspot/.gitignore b/nfcsweetspot/.gitignore
deleted file mode 100644
index a44cc0f0f..000000000
--- a/nfcsweetspot/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-#Android specific
-bin
-gen
-obj
-lint.xml
-local.properties
-release.properties
-ant.properties
-*.class
-*.apk
-
-#Gradle
-.gradle
-build
-gradle.properties
-
-#Maven
-target
-pom.xml.*
-
-#Eclipse
-.project
-.classpath
-.settings
-.metadata
-
-#IntelliJ IDEA
-.idea
-*.iml
-
-#Lint output
-lint-report.html
-lint-report_files/*
\ No newline at end of file
diff --git a/nfcsweetspot/build.gradle b/nfcsweetspot/build.gradle
index 47545db9c..23de1d09a 100644
--- a/nfcsweetspot/build.gradle
+++ b/nfcsweetspot/build.gradle
@@ -1,8 +1,5 @@
 apply plugin: 'com.android.library'
 
-dependencies {
-}
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
diff --git a/sshauthentication-api/build.gradle b/sshauthentication-api/build.gradle
index 3ea2689fd..12f3f4681 100644
--- a/sshauthentication-api/build.gradle
+++ b/sshauthentication-api/build.gradle
@@ -1,17 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'bintray-release' // must be applied after your artifact generating plugin (eg. java / com.android.library)
 
-buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'com.novoda:bintray-release:0.8.0'
-    }
-}
-
 android {
     if (project.hasProperty('rootProject.ext.compileSdkVersion')) {
         compileSdkVersion rootProject.ext.compileSdkVersion