X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=80662c0dc93a783127b0eecce6deebab7b68ed65;hp=03805931e9d78b07ad5a23d65172cd1c0e8ebb97;hb=bc45b14cfda10249800a6ccfdb8247d2ce9b32a9;hpb=58e6c22da860871eadd1cbf214a30e88ced4f19e

diff --git a/app/build.gradle b/app/build.gradle
index 03805931..80662c0d 100644
--- 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,42 +20,62 @@
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-    }
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
     defaultConfig {
-        applicationId "com.stoutner.privacybrowser"
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 5
-        versionName "1.4"
+        minSdkVersion 19
+        targetSdkVersion 27
+        versionCode 34
+        versionName "2.11"
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+        }
+
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
+    // Gradle requires a `flavorDimension`, but it isn't used for anything in Privacy Browser.
+    flavorDimensions "basic"
+
     productFlavors {
         standard {
             applicationId "com.stoutner.privacybrowser.standard"
-            versionName "1.4-standard"
+            dimension "basic"
         }
 
         free {
             applicationId "com.stoutner.privacybrowser.free"
-            versionName "1.4-free"
+            dimension "basic"
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    // Allow the releases to be built even though the versions of the support and consent libraries don't match (Privacy Browser doesn't use the consent library form, so it doesn't matter).
+    lintOptions {
+        abortOnError false
+    }
 }
 
 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.
-    freeCompile 'com.google.android.gms:play-services-ads:8.4.0'
-}
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:design:27.0.2'
+
+    // Only compile Firebase ads for the free flavor.
+    freeImplementation 'com.google.firebase:firebase-ads:15.0.1'
+
+    // Only compile the consent library for the free flavor.  It is used to comply with the GDPR in Europe.
+    freeImplementation 'com.google.android.ads.consent:consent-library:1.0.6'
+}
\ No newline at end of file