X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=7e45a6393641121489d28c9d1dade09f98b6cb5e;hp=df66f58a9ee3b4f73b187f324e0848fee2aab92c;hb=5bd318993ebf675433f514dd04fc3e29545c9312;hpb=0b0c40ca00cfdd80f3e215528f1b9c7f95bbcfe1

diff --git a/app/build.gradle b/app/build.gradle
index df66f58a..7e45a639 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -20,22 +20,24 @@
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-    }
-
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
     defaultConfig {
-        applicationId "com.stoutner.privacybrowser"
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 3
-        versionName "1.2"
+        minSdkVersion 19
+        targetSdkVersion 25
+        versionCode 17
+        versionName "1.14.1"
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+        }
+
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -43,19 +45,25 @@ android {
     productFlavors {
         standard {
             applicationId "com.stoutner.privacybrowser.standard"
-            versionName "1.2-standard"
         }
 
         free {
             applicationId "com.stoutner.privacybrowser.free"
-            versionName "1.2-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.3.0'
-    // Only compile com.google.android.gms:play-services-ads for the free version so that the standard version can build of F-Droid.
-    freeCompile 'com.google.android.gms:play-services-ads:8.4.0'
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:design:25.1.0'
+
+    // 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 the 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