X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fbuild.gradle;h=8a9af719f18cebbf1384650b5561169aa78e8cf5;hb=5a9cabddff240061fe521f01df3025b037e9da9e;hp=25c4781126806ddfebc29ce427cc2a21d3ace482;hpb=57b05bcbae9759d4b58ce3b96ede61992eb34eee;p=PrivacyBrowserAndroid.git

diff --git a/app/build.gradle b/app/build.gradle
index 25c47811..8a9af719 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,22 +20,24 @@
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-    }
-
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
     defaultConfig {
-        applicationId "com.stoutner.privacybrowser"
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 7
-        versionName "1.6"
+        minSdkVersion 19
+        targetSdkVersion 24
+        versionCode 15
+        versionName "1.13"
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+        }
+
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -49,11 +51,19 @@ android {
             applicationId "com.stoutner.privacybrowser.free"
         }
     }
+
+    // `return void` removes the lint error: `Not all execution paths return a value`.
+    return void
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:design:23.4.0'
-    // Only compile com.google.android.gms:play-services-ads for the free version.
-    freeCompile 'com.google.android.gms:play-services-ads:9.0.0'
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:design:24.2.1'
+
+    // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor.
+    freeCompile 'com.google.firebase:firebase-ads:9.8.0'
 }
+
+// Google's documentation says the following line is required for `firebase-ads` but things work correctly without it.  I have no interest in applying this Google Mobile Services plugin in the standard flavor if I don't have to.
+// I suspect that in the free flavor `firebase-ads` applies it even when not specified.  https://firebase.google.com/docs/admob/android/quick-start
+// apply plugin: 'com.google.gms.google-services'
\ No newline at end of file