X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fbuild.gradle;h=785bb41646c0350021b942385d0c61e71b7bb595;hp=5e97dbee7fcb7ccdb99dfd37f249a5cde821a413;hb=47361652ebde9a4bd7d8d3520c8dd988953b8614;hpb=ae2ee09aa7a2afc19f5603c9bc021f98888d7b78

diff --git a/app/build.gradle b/app/build.gradle
index 5e97dbee..785bb416 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+/*
+ * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -18,15 +18,21 @@
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
+
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 24
-        versionCode 14
-        versionName "1.12"
+        targetSdkVersion 29
+        versionCode 49
+        versionName "3.4.1"
+
+        // The `multiDexEnabled` entry could possibly be removed once the `minSdkVersion` is >= 21.
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -42,27 +48,53 @@ android {
         }
     }
 
+    // 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
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:design:24.2.1'
-    // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor.
-    freeCompile 'com.google.firebase:firebase-ads:9.8.0'
+repositories {
+    mavenCentral()
 }
 
-// Google's documentation says the following line is required for `firebase-ads` but things work correctly without it.  I have no interest in including Google Mobile Services if I don't have to.
-// https://firebase.google.com/docs/admob/android/quick-start
-// apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
+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.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation "androidx.core:core-ktx:1.2.0"
+    implementation 'androidx.drawerlayout:drawerlayout:1.0.0'
+    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.webkit:webkit:1.2.0'
+
+    // Include the Kotlin standard libraries
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61"
+
+    // Include the Google material library.
+    implementation 'com.google.android.material:material:1.1.0'
+
+    // Only compile Firebase ads for the free flavor.
+    freeImplementation 'com.google.firebase:firebase-ads:19.0.1'
+}
\ No newline at end of file