X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fbuild.gradle;h=8a9af719f18cebbf1384650b5561169aa78e8cf5;hb=3a940b246f0027c85294931abb79ada28e7c343f;hp=823eb5e86be9be0f25bd938a127aebca897025df;hpb=e4395e4c0786da8ce5c00cb2762e78ad706e86db;p=PrivacyBrowserAndroid.git

diff --git a/app/build.gradle b/app/build.gradle
index 823eb5e8..302b478c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016 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>.
  *
@@ -18,15 +18,19 @@
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 30
+
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 24
-        versionCode 12
-        versionName "1.10"
+        targetSdkVersion 30
+        versionCode 55
+        versionName "3.8"
+
+        // `multiDexEnabled` can possibly be removed once the `minSdkVersion` is >= 21.
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -38,27 +42,52 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.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"
+            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
+repositories {
+    mavenCentral()
 }
 
 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.8.00'
-}
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+
+    // 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.3.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'androidx.core:core-ktx:1.5.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 libraries.  This should be the same version number listed in project build.gradle.
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20'
+
+    // Include the Google material library.
+    implementation 'com.google.android.material:material:1.3.0'
+
+    // Only compile AdMob ads for the free flavor.
+    freeImplementation 'com.google.android.gms:play-services-ads:20.2.0'
+}
\ No newline at end of file