diff --git a/app/build.gradle b/app/build.gradle
index 785cd90..d68e9a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,6 +33,11 @@
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "nl.digital_me.dummyandroidapp"
         minSdkVersion 14
@@ -40,6 +45,8 @@
         versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 70
         versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.5"
         multiDexEnabled true
+
+        buildConfigField "boolean", "CRASHLYTICS", "true"
     }
 
     dexOptions {
@@ -56,9 +63,9 @@
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-glide.pro', 'proguard-fresco.pro', 'proguard-rules.pro'
             debuggable false
         }
-
         debug {
-            minifyEnabled false
+            minifyEnabled true
+            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-glide.pro', 'proguard-fresco.pro', 'proguard-rules.pro'
             debuggable true
         }
@@ -66,7 +73,7 @@
 
     flavorDimensions "env"
 
-    productFlavors { // May need to match branch name, passed by Jenkins PL as environment variable named LAZY_BRANCH
+    productFlavors { // May need to match branch name, passed by Jenkins PL as environment variable named BRANCH_NAME
         systemtest {
             resValue "string", "app_name", "DummyAnd STst"
             applicationIdSuffix ".stst"
@@ -131,7 +138,8 @@
 dependencies {
     //compile fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation "junit:junit:$rootProject.junitVersion"
+    testImplementation "org.mockito:mockito-core:2.19.0"
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.0'
 }