X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fbuild.gradle;h=302b478ca8dff9d933b719a3c69cf6b3ce822bdd;hb=97014b2c0c9fe06c01a86960bf9b4124e28a2793;hp=c8792729e54d3917b93d502aededea0e67b889b0;hpb=4f704be746c00c0a29a52c28646e6d7cf2f9c53c;p=PrivacyBrowserAndroid.git

diff --git a/app/build.gradle b/app/build.gradle
index c8792729..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,44 +18,76 @@
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    signingConfigs {
-    }
+    compileSdkVersion 30
 
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
     defaultConfig {
-        applicationId "com.stoutner.privacybrowser"
-        minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 4
-        versionName "1.3"
+        minSdkVersion 19
+        targetSdkVersion 30
+        versionCode 55
+        versionName "3.8"
+
+        // `multiDexEnabled` can possibly be removed once the `minSdkVersion` is >= 21.
+        multiDexEnabled true
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+        }
+
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            shrinkResources true
+            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"
-            versionName "1.3-standard"
+            dimension "basic"
         }
 
         free {
             applicationId "com.stoutner.privacybrowser.free"
-            versionName "1.3-free"
+            dimension "basic"
         }
     }
 }
 
-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 so that the standard version can build of F-Droid.
-    freeCompile 'com.google.android.gms:play-services-ads:8.4.0'
+repositories {
+    mavenCentral()
 }
+
+dependencies {
+    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