Don't reload web pages on a new intent unless the intent contains a new URL. Fixes...

[PrivacyBrowserAndroid.git] / app / build.gradle

diff --git a/app/build.gradle b/app/build.gradle
index 5e97dbee7fcb7ccdb99dfd37f249a5cde821a413..55df3775d7ebb5e8ec12dce20bbd2dfaf0e544c6 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+/*
+ * Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -20,13 +20,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 24
-        versionCode 14
-        versionName "1.12"
+        targetSdkVersion 27
+        versionCode 31
+        versionName "2.8.1"
     }
 
     buildTypes {
@@ -42,27 +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(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'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:design:27.0.2'
+    // Only compile `com.google.firebase:firebase-ads` for the free flavor.
+    freeImplementation 'com.google.firebase:firebase-ads:11.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 including Google Mobile Services if I don't have to.
-// https://firebase.google.com/docs/admob/android/quick-start
+// 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