update sdk to version 28, update dependencies, fix potential memory leaks

1 files changed, 31 insertions, 20 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 6dff8e34..51c16eaa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ apply plugin: 'com.android.application'
 def appName = 'Bitmask'
 
 android {
-  compileSdkVersion 27
-  buildToolsVersion '27.0.3'
+  compileSdkVersion 28
+  buildToolsVersion '28.0.3'
 
   compileOptions {
     targetCompatibility 1.8
@@ -169,9 +169,9 @@ dependencies {
   androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
   testImplementation 'junit:junit:4.12'
   testImplementation 'org.json:json:20170516'
-  debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
-  releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
-  betaImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+  debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
+  releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
+  betaImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
   annotationProcessor 'com.jakewharton:butterknife:6.1.0'
   annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2'
   implementation 'com.jakewharton:butterknife:6.1.0'
@@ -182,15 +182,15 @@ dependencies {
   implementation 'com.intellij:annotations:12.0'
   implementation 'com.google.code.gson:gson:2.8.2'
   implementation 'com.squareup.okhttp3:okhttp:3.9.0'
-  implementation "com.android.support:support-core-utils:27.0.2"
-  implementation 'com.android.support:support-annotations:27.0.2'
-  implementation 'com.android.support:support-v4:27.0.2'
-  implementation 'com.android.support:appcompat-v7:27.0.2'
-  implementation 'com.android.support:design:27.0.2'
-  implementation 'com.android.support:support-fragment:27.0.2'
-  implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-  implementation 'com.android.support:multidex:1.0.2'
-  implementation 'com.android.support:cardview-v7:27.0.2'
+  implementation "com.android.support:support-core-utils:28.0.0"
+  implementation 'com.android.support:support-annotations:28.0.0'
+  implementation 'com.android.support:support-v4:28.0.0'
+  implementation 'com.android.support:appcompat-v7:28.0.0'
+  implementation 'com.android.support:design:28.0.0'
+  implementation 'com.android.support:support-fragment:28.0.0'
+  implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+  implementation 'com.android.support:multidex:1.0.3'
+  implementation 'com.android.support:cardview-v7:28.0.0'
 }
 
 // Ensure the no-op dependency is always used in JVM tests.
@@ -202,12 +202,23 @@ configurations.all { config ->
       }
     }
   }
-  resolutionStrategy.force "com.android.support:support-annotations:27.0.2"
-  resolutionStrategy.force "com.android.support:support-v4:27.0.2"
-  resolutionStrategy.force "com.android.support:support-core-utils:27.0.2"
-  resolutionStrategy.force "com.android.support:appcompat-v7:27.0.2"
-  resolutionStrategy.force "com.android.support:design:27.0.2"
-  resolutionStrategy.force "com.android.support:support-fragment:27.0.2"
+  resolutionStrategy.force "com.android.support:support-annotations:28.0.0"
+  resolutionStrategy.force "com.android.support:support-v4:28.0.0"
+  resolutionStrategy.force "com.android.support:support-core-utils:28.0.0"
+  resolutionStrategy.force "com.android.support:appcompat-v7:28.0.0"
+  resolutionStrategy.force "com.android.support:design:28.0.0"
+  resolutionStrategy.force "com.android.support:support-fragment:28.0.0"
+}
+
+subprojects {
+  afterEvaluate {project ->
+    if (project.hasProperty("android")) {
+      android {
+        compileSdkVersion 28
+        buildToolsVersion "28.0.3"
+      }
+    }
+  }
 }
 
 def processFileInplace(file, Closure processText) {