X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=5217e15945e7e229971e40073ae8ff78089be060;hp=6b98bafd449bfce147f8aa3f82460958c471c172;hb=eb9bc527c37223964f7c00592df982b47ff2f81c;hpb=bc6574b86391ed9c731835c18de7bd0a10de19f8

diff --git a/app/build.gradle b/app/build.gradle
index 6b98bafd..5217e159 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,14 +20,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 26
+    buildToolsVersion '26.0.3'
     defaultConfig {
-        applicationId "com.stoutner.privacybrowser"
         minSdkVersion 19
-        targetSdkVersion 24
-        versionCode 12
-        versionName "1.10"
+        targetSdkVersion 26
+        versionCode 27
+        versionName "2.7"
     }
 
     buildTypes {
@@ -43,23 +42,34 @@ android {
         }
     }
 
+    // Gradle requires a `flavorDimension`, but it isn't used for anything in Privacy Browser.
+    flavorDimensions "basic"
+
     productFlavors {
         standard {
             applicationId "com.stoutner.privacybrowser.standard"
+            dimension "basic"
         }
 
         free {
             applicationId "com.stoutner.privacybrowser.free"
+            dimension "basic"
         }
     }
 
-    // `return void` removes the lint error: `Not all execution paths return a value`.
-    return void
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:design:24.2.1'
-    // Only compile `com.google.android.gms:play-services-ads` for the free flavor.
-    freeCompile 'com.google.android.gms:play-services-ads:9.4.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:design:26.1.0'
+    // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor.
+    freeImplementation 'com.google.firebase:firebase-ads:11.4.2'
 }
+
+// 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