Update tasks and apply spotlessv2.4.4

1 files changed, 18 insertions, 3 deletions

diff --git a/app/build.gradle b/app/build.gradle
index fde143ad..3216e238 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -328,14 +328,29 @@ configurations.all {
     }
 }
 
-// Validates code and generates apk
-// TODO order tasks; though technically it doesn't matter
-task createGithubReleaseApk {
+task lintGithubReleaseApk {
     dependsOn 'spotlessCheck'
     dependsOn 'lintRelease'
+}
+
+task testGithubReleaseApk {
     dependsOn 'testReleaseUnitTest'
     dependsOn 'connectedAndroidTest'
+}
+
+task assembleGithubReleaseApk {
     dependsOn 'assembleRelease'
 }
 
+// Validates code and generates apk
+// TODO order tasks; though technically it doesn't matter
+task createGithubReleaseApk {
+    dependsOn 'lintGithubReleaseApk'
+    dependsOn 'testGithubReleaseApk'
+    dependsOn 'assembleGithubReleaseApk'
+
+    tasks.findByName('testGithubReleaseApk').mustRunAfter 'lintGithubReleaseApk'
+    tasks.findByName('assembleGithubReleaseApk').mustRunAfter 'testGithubReleaseApk'
+}
+
 apply plugin: 'com.bugsnag.android.gradle'
\ No newline at end of file