X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=2d893f9eeb2c0f61de1a622edde66d58e3cbe427;hp=dfda40c23d5285273d4f8fdca6155bef5178f630;hb=392f2726cd21539c5ec89e0d09d2e7d7922bebad;hpb=6fa1563622642855d342cd7bcb523a8c1b6bbc44

diff --git a/app/build.gradle b/app/build.gradle
index dfda40c2..2d893f9e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -17,17 +17,22 @@
  * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdk 31
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 40
-        versionName "2.16"
+        minSdk 19
+        targetSdk 31
+        versionCode 57
+        versionName "3.9"
+
+        // `multiDexEnabled` can possibly be removed once the `minSdkVersion` is >= 21.
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -39,7 +44,7 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -57,22 +62,28 @@ android {
             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 {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:design:28.0.0'
+    // Include the following AndroidX libraries.
+    implementation 'androidx.arch.core:core-common:2.1.0'
+    implementation 'androidx.arch.core:core-runtime:2.1.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.webkit:webkit:1.4.0'
+
+    // Include the Kotlin standard library.  This should be the same version number listed in project build.gradle.
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0'
+
+    // Include the Google material library.
+    implementation 'com.google.android.material:material:1.4.0'
 
-    // Only compile Firebase ads for the free flavor.
-    freeImplementation 'com.google.firebase:firebase-ads:17.1.2'
+    // Only compile AdMob ads for the free flavor.
+    freeImplementation 'com.google.android.gms:play-services-ads:20.5.0'
 }
\ No newline at end of file