X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fbuild.gradle;h=90f243c52d5ce360a5d2868c0e897155659c3265;hb=c43f17e8f20c0c348b944047e0555f36ac00b86d;hp=a2b17ad8e52dbc4fdf5c74c6893ef9ae69154de4;hpb=6eb99f0c383d678bc62208ddad0b1bfb2ee6e352;p=PrivacyBrowserAndroid.git

diff --git a/app/build.gradle b/app/build.gradle
index a2b17ad8..90f243c5 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 19
-        targetSdkVersion 23
-        versionCode 9
-        versionName "1.8"
+        targetSdkVersion 24
+        versionCode 14
+        versionName "1.12"
     }
 
     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 flavor.
-    freeCompile 'com.google.android.gms:play-services-ads:9.4.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