Fix the ViewPager not always moving to new tabs. https://redmine.stoutner.com/issues/798

[PrivacyBrowserAndroid.git] / app / build.gradle

diff --git a/app/build.gradle b/app/build.gradle
index 15b6d70069e4ee64ea68a95880376c9e2c366a67..9816690d07b11c30bc6d5e07ab859b78bcce9cee 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,33 +1,38 @@
 /*
- * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  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 46
-        versionName "3.2"
+        minSdk 23
+        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'
         }
     }
 
@@ -52,34 +57,30 @@ android {
             dimension "basic"
         }
 
-        free {
-            applicationId "com.stoutner.privacybrowser.free"
+        alt {
+            applicationId "com.stoutner.privacybrowser.alt"
             dimension "basic"
         }
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
 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.appcompat:appcompat:1.4.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.0.0'
-    implementation 'androidx.drawerlayout:drawerlayout:1.0.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.drawerlayout:drawerlayout:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.webkit:webkit:1.4.0'
 
-    // Include the Google material library.
-    implementation 'com.google.android.material:material:1.0.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.10'
 
-    // Only compile Firebase ads for the free flavor.
-    freeImplementation 'com.google.firebase:firebase-ads:18.2.0'
+    // Include the Google material library.
+    implementation 'com.google.android.material:material:1.5.0'
 }
\ No newline at end of file