X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=8710e38df3456954eeac4b876568d227b4559403;hp=50c0c2cfe8af776c532d7eadf2ad51ff18f7cc1d;hb=06f516f2f5c745981e292451d01b9df7d1fd57eb;hpb=24f2d6529540bc8ea47f45bc07dd058f402a9140

diff --git a/app/build.gradle b/app/build.gradle
index 50c0c2cf..8710e38d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2017 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,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.2'
+
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 26
-        versionCode 28
-        versionName "2.7.1"
+        targetSdkVersion 28
+        versionCode 35
+        versionName "2.12"
     }
 
     buildTypes {
@@ -61,15 +62,20 @@ android {
         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 {
     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'
-}
+    implementation 'com.android.support:design:28.0.0-rc01'
+
+    // Only compile Firebase ads for the free flavor.
+    freeImplementation 'com.google.firebase:firebase-ads:15.0.1'
 
-// 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
+    // 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